[Jpackage-commits] dist/gnu-getopt/devel gnu-getopt-component-info.xml, 1.2, 1.3 gnu-getopt.spec, 1.2, 1.3

jpackage-guest jpackage-guest at ryu.zarb.org
Thu Jul 30 10:54:11 CEST 2009


Update of /home/projects/jpackage/cvs/dist/gnu-getopt/devel
In directory ryu.zarb.org:/tmp/cvs-serv13965

Modified Files:
	gnu-getopt-component-info.xml gnu-getopt.spec 
Log Message:
Merge changes from JPP5 1.0.12-3 to 1.0.12-6

Index: gnu-getopt-component-info.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gnu-getopt/devel/gnu-getopt-component-info.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** gnu-getopt-component-info.xml	29 Jul 2009 07:57:29 -0000	1.2
--- gnu-getopt-component-info.xml	30 Jul 2009 08:54:09 -0000	1.3
***************
*** 5,9 ****
     <component id="gnu-getopt"
                licenseType="lgpl"
!               version="1.0.13-brew"
                projectHome="http://www.urbanophile.com/arenn/hacking/download.html"
                description="Java getopt classes for short and long argument parsing"
--- 5,9 ----
     <component id="gnu-getopt"
                licenseType="lgpl"
!               version="@VERSION@"
                projectHome="http://www.urbanophile.com/arenn/hacking/download.html"
                description="Java getopt classes for short and long argument parsing"

Index: gnu-getopt.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/gnu-getopt/devel/gnu-getopt.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** gnu-getopt.spec	29 Jul 2009 07:57:29 -0000	1.2
--- gnu-getopt.spec	30 Jul 2009 08:54:09 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
***************
*** 45,62 ****
  Name:		gnu-getopt
  Version:	1.0.13
! Release:	1%{?dist}
  Epoch:		0
  Summary:        Java getopt implementation
! License:        LGPL
! Url:            http://www.urbanophile.com/arenn/hacking/download.html
! Source0:        http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.13.tar.gz
  Source1:	gnu-getopt-component-info.xml
! BuildRequires:  ant
  Group:          Development/Libraries/Java
! Buildarch:      noarch
  BuildRequires:	jpackage-utils >= 0:1.6
! Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
! Provides:	gnu.getopt
! Obsoletes:	gnu.getopt
  
  %description
--- 45,63 ----
  Name:		gnu-getopt
  Version:	1.0.13
! Release:	2%{?dist}
  Epoch:		0
  Summary:        Java getopt implementation
! License:        LGPLv2+
! URL:            http://www.urbanophile.com/arenn/hacking/download.html
! Source0:        http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-1.0.12.tar.gz
  Source1:	gnu-getopt-component-info.xml
! Source2:        gnu-getopt-1.0.13.pom
  Group:          Development/Libraries/Java
! Provides:	gnu.getopt = %{epoch}:%{version}-%{release}
! Obsoletes:	gnu.getopt < %{epoch}:%{version}-%{release}
! BuildRequires:  ant
  BuildRequires:	jpackage-utils >= 0:1.6
! BuildArch:      noarch
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 69,80 ****
  
  %if %{with_repolib}
! %package	 repolib
  Summary:	 Artifacts to be uploaded to a repository library
! Group:	Development/Libraries/Java
  
! %description	 repolib
  Artifacts to be uploaded to a repository library.
  This package is not meant to be installed but so its contents
! can be extracted through rpm2cpio
  %endif
  
--- 70,81 ----
  
  %if %{with_repolib}
! %package repolib
  Summary:	 Artifacts to be uploaded to a repository library
! Group:           Development/Libraries/Java
  
! %description repolib
  Artifacts to be uploaded to a repository library.
  This package is not meant to be installed but so its contents
! can be extracted through rpm2cpio.
  %endif
  
***************
*** 82,87 ****
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
! Provides:	gnu.getopt-javadoc
! Obsoletes:	gnu.getopt-javadoc
  
  %description javadoc
--- 83,88 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
! Provides:	gnu.getopt-javadoc = %{epoch}:%{version}-%{release}
! Obsoletes:	gnu.getopt-javadoc < %{epoch}:%{version}-%{release}
  
  %description javadoc
***************
*** 93,152 ****
  mv gnu/getopt/buildx.xml build.xml
  
- tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
- sed -i "s/@TAG@/$tag/g" %{SOURCE1}
- 
  %build
  %ant jar javadoc
  
  %install
  # jars
  %__mkdir_p %{buildroot}%{_javadir}
  %__install -m 644 build/lib/gnu.getopt.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} ${jar/-%{version}/}; done
! %__ln_s %{name}.jar gnu.getopt.jar)
  # javadoc
  %__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
  %__cp -a build/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
  
  %if %{with_repolib}
  	install -d -m 755 $RPM_BUILD_ROOT%{repodir}
  	install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! 	install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml
  	install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! 	install -m 755 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! 	cp $RPM_BUILD_ROOT%{_javadir}/gnu-getopt.jar $RPM_BUILD_ROOT%{repodirlib}/getopt.jar
  %endif
  
  %clean
! %__rm -rf %{buildroot}
  
! %post javadoc
! %__rm -f %{_javadocdir}/%{name}
! %__ln_s %{name}-%{version} %{_javadocdir}/%{name}
  
! %postun javadoc
! if [ "$1" = "0" ]; then
!     %__rm -f %{_javadocdir}/%{name}
! fi
  
  %files
  %defattr(0644,root,root,0755)
  %doc gnu/getopt/COPYING.LIB gnu/getopt/README
! %{_javadir}/*
  
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
  
  %if %{with_repolib}
  %files repolib
  %defattr(0644,root,root,0755)
! %{repodir}
  %endif
  
  %changelog
! *  Wed Jul 29 2009 Yong Yang <yyang at redhat.com> 0:1.0.13-1
  - 1.0.13
  
  * Thu May 29 2008 Permaine Cheung <pcheung at redhat.com> 0:1.0.12-2
  - First JPP 5 build
--- 94,179 ----
  mv gnu/getopt/buildx.xml build.xml
  
  %build
+ export CLASSPATH=
+ export OPT_JAR_LIST=:
  %ant jar javadoc
  
  %install
+ %__rm -rf %{buildroot}
+ 
  # jars
  %__mkdir_p %{buildroot}%{_javadir}
  %__install -m 644 build/lib/gnu.getopt.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
! %__ln_s %{name}-%{version}.jar %{buildroot}%{_javadir}/gnu.getopt-%{version}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do %__ln_s ${jar} ${jar/-%{version}/}; done)
! 
  # javadoc
  %__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
  %__cp -a build/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ %__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+ 
+ # poms
+ %add_to_maven_depmap gnu-getopt getopt %{version} JPP %{name}
+ %{__install} -D -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  
  %if %{with_repolib}
  	install -d -m 755 $RPM_BUILD_ROOT%{repodir}
  	install -d -m 755 $RPM_BUILD_ROOT%{repodirlib}
! 	install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         sed -i 's/@VERSION@/%{version}-brew/g' $RPM_BUILD_ROOT%{repodir}/component-info.xml
!         tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'`
!         sed -i "s/@TAG@/$tag/g" $RPM_BUILD_ROOT%{repodir}/component-info.xml
  	install -d -m 755 $RPM_BUILD_ROOT%{repodirsrc}
! 	install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{repodirsrc}
! 	cp -p $RPM_BUILD_ROOT%{_javadir}/gnu-getopt.jar $RPM_BUILD_ROOT%{repodirlib}/getopt.jar
  %endif
  
  %clean
! %{__rm} -rf %{buildroot}
  
! %post
! %update_maven_depmap
  
! %postun
! %update_maven_depmap
  
  %files
  %defattr(0644,root,root,0755)
  %doc gnu/getopt/COPYING.LIB gnu/getopt/README
! %{_javadir}/*.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
+ %{_javadocdir}/%{name}
  
  %if %{with_repolib}
  %files repolib
  %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
  %endif
  
  %changelog
! * Thu Jul 30 2009 Yong Yang <yyang at redhat.com> 0:1.0.13-2
! - Merge changes from JPP5 1.0.12-3 to 1.0.12-6 
! 
! * Wed Jul 29 2009 Yong Yang <yyang at redhat.com> 0:1.0.13-1
  - 1.0.13
  
+ * Wed Aug 20 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-6
+ - call %%update_maven_depmap
+ 
+ * Wed Aug 20 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-5
+ - add pom
+ - fix component-info.xml
+ 
+ * Wed Aug 13 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-4
+ - bump release
+ - don't duplicate repolib in main package
+ - own repolib dirs
+ - fix repolib permissions
+ 
  * Thu May 29 2008 Permaine Cheung <pcheung at redhat.com> 0:1.0.12-2
  - First JPP 5 build
***************
*** 187,195 ****
  - For jpackage-utils 1.5
  
! * Sat Feb 16 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.9-1jpp 
  - 1.0.9
  - build script merged upstream
  
! * Sat Jan 19 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.8-2jpp 
  - versioned dir for javadoc
  - no dependencies for javadoc package
--- 214,222 ----
  - For jpackage-utils 1.5
  
! * Sat Feb 16 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.9-1jpp
  - 1.0.9
  - build script merged upstream
  
! * Sat Jan 19 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.8-2jpp
  - versioned dir for javadoc
  - no dependencies for javadoc package




More information about the JPackage-commits mailing list