[Jpackage-commits] rpms/free/jzlib jzlib-1.0.7.pom, NONE, 1.1 jzlib.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Fri Dec 17 15:47:30 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/jzlib
In directory ryu.zarb.org:/tmp/htNSKzLfi_/rpms/free/jzlib

Modified Files:
	jzlib.spec 
Added Files:
	jzlib-1.0.7.pom 
Log Message:
1.0.7-5.jpp6

Index: jzlib.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/jzlib/jzlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** jzlib.spec	10 Jun 2008 16:38:35 -0000	1.3
--- jzlib.spec	17 Dec 2010 14:47:28 -0000	1.4
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 35,39 ****
  Name:           jzlib
  Version:        1.0.7
! Release:        4%{?dist}
  Epoch:          0
  Summary:        JZlib re-implementation of zlib in pure Java
--- 35,39 ----
  Name:           jzlib
  Version:        1.0.7
! Release:        5%{?dist}
  Epoch:          0
  Summary:        JZlib re-implementation of zlib in pure Java
***************
*** 44,56 ****
  Source0:        http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
  Source1:        %{name}_build.xml
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
- Distribution:   JPackage
- Vendor:         JPackage Project
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.6
! BuildRequires:  ant >= 0:1.6
  
  %if %{gcj_support}
--- 44,59 ----
  Source0:        http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
  Source1:        %{name}_build.xml
+ Source2:        http://repo1.maven.org/maven2/com/jcraft/jzlib/1.0.7/jzlib-1.0.7.pom
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %if ! %{gcj_support}
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.6.0
! BuildRequires:  ant >= 0:1.7.1
! Requires:  java >= 0:1.6.0
! Requires(post):    jpackage-utils >= 0:1.7.5
! Requires(postun):  jpackage-utils >= 0:1.7.5
  
  %if %{gcj_support}
***************
*** 70,76 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
- Requires(post): 	%{__rm}
- Requires(post): 	/bin/ln
- Requires(postun):	%{__rm}
  
  %description    javadoc
--- 73,76 ----
***************
*** 80,86 ****
  Summary:        Examples for %{name}
  Group:          Development/Libraries/Java
- Requires(post): 	%{__rm}
- Requires(post): 	/bin/ln
- Requires(postun):	%{__rm}
  
  %description    demo
--- 80,83 ----
***************
*** 100,107 ****
  # jars
  rm -rf $RPM_BUILD_ROOT
! install -Dpm 644 dist/lib/%{name}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
  # javadoc
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
--- 97,108 ----
  # jars
  rm -rf $RPM_BUILD_ROOT
! install -Dm 644 dist/lib/%{name}.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
  
+ # pom
+ install -Dm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ %add_to_maven_depmap com.jcraft %{name} %{version} JPP %{name}
+ 
  # javadoc
  install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
***************
*** 112,116 ****
  install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
  cp -pr example/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
- ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} # ghost symlink
  
  
--- 113,116 ----
***************
*** 122,145 ****
  rm -rf $RPM_BUILD_ROOT
  
- 
- %post javadoc
- rm -f %{_javadocdir}/%{name}
- ln -s %{name}-%{version} %{_javadocdir}/%{name}
- 
- %postun javadoc
- if [ "$1" = "0" ]; then
-     rm -f %{_javadocdir}/%{name}
- fi
- 
- %post demo
- rm -f %{_datadir}/%{name}
- ln -s %{name}-%{version} %{_datadir}/%{name}
- 
- %postun demo
- if [ "$1" = "0" ]; then
-     rm -f %{_datadir}/%{name}
- fi
- 
  %post
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
--- 122,127 ----
  rm -rf $RPM_BUILD_ROOT
  
  %post
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 150,153 ****
--- 132,136 ----
  
  %postun
+ %update_maven_depmap
  %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
***************
*** 161,164 ****
--- 144,150 ----
  %{_javadir}/*.jar
  %doc LICENSE.txt
+ %{_datadir}/maven2/poms/*
+ %{_mavendepmapfragdir}/*
+ 
  
  %if %{gcj_support}
***************
*** 168,180 ****
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %files demo
  %defattr(0644,root,root,0755)
  %doc %{_datadir}/%{name}-%{version}
- %ghost %doc %{_datadir}/%{name}
  
  %changelog
  * Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-4jpp
  - Add postun sections for javadoc and demo subpackages.
--- 154,168 ----
  %files javadoc
  %defattr(0644,root,root,0755)
! %doc %{_javadocdir}/%{name}*
  
  %files demo
  %defattr(0644,root,root,0755)
  %doc %{_datadir}/%{name}-%{version}
  
  %changelog
+ * Fri Dec 17 2010 Ralph Apel <r.apel at r-apel.de> - 0:1.0.7-5
+ - Prepare for JPP-6
+ - Add pom and depmap frag
+ 
  * Tue Aug 08 2006 Vivek Lakshmanan <vivekl at redhat.com> - 0:1.0.7-4jpp
  - Add postun sections for javadoc and demo subpackages.

--- NEW FILE: jzlib-1.0.7.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

  <modelVersion>4.0.0</modelVersion>
  <groupId>com.jcraft</groupId>
  <artifactId>jzlib</artifactId>
  <version>1.0.7</version>
  <name>JZlib</name>
  <description>JZlib is a re-implementation of zlib in pure Java</description>
  <url>http://www.jcraft.com/jzlib/</url>

  <organization>
    <name>jcraft</name>
    <url>http://www.jcraft.com/jsch</url>
  </organization>

  <licenses>
    <license>
      <name>BSD</name>
      <url>http://www.jcraft.com/jzlib/LICENSE.txt</url>
    </license>
  </licenses>

  <distributionManagement>
    <status>deployed</status>
  </distributionManagement>

</project>



More information about the JPackage-commits mailing list