rpms/gnu-getopt/devel gnu-getopt-1.0.13.pom, NONE, 1.1 .cvsignore, 1.2, 1.3 gnu-getopt.spec, 1.8, 1.9 sources, 1.2, 1.3

Wed Sep 9 14:18:11 UTC 2009

Author: dwalluck

Update of /cvs/pkgs/rpms/gnu-getopt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27416

Modified Files:
	.cvsignore gnu-getopt.spec sources 
Added Files:
	gnu-getopt-1.0.13.pom 
Log Message:
- sync with 1.0.13-3.jpp6

--- NEW FILE gnu-getopt-1.0.13.pom ---
<?xml version="1.0"?>

<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>gnu-getopt</groupId>
  <artifactId>getopt</artifactId>
  <version>1.0.13</version>
  
  <name>ON Enterprise Server JAR</name>
  <description>JON enterprise server main JAR</description>
  <url>http://www.urbanophile.com/arenn/hacking/download.html</url>
  
  <licenses>
    <license>
      <name>GNU Lesser General Public License (LGPL)</name>
	   <url>http://www.gnu.org/licenses/lgpl.html</url>
    </license>
  </licenses>

</project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-getopt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	23 May 2006 18:42:39 -0000	1.2
+++ .cvsignore	9 Sep 2009 14:18:11 -0000	1.3
@@ -1 +1 @@
-java-getopt-1.0.12.tar.gz
+java-getopt-1.0.13.tar.gz


Index: gnu-getopt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-getopt/devel/gnu-getopt.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- gnu-getopt.spec	25 Jul 2009 00:54:16 -0000	1.8
+++ gnu-getopt.spec	9 Sep 2009 14:18:11 -0000	1.9
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2009, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,35 +28,26 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _gcj_support 1
+%define section free
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-%define	section		free
-
-Name:		gnu-getopt
-Version:	1.0.12
-Release:	7%{?dist}
-Epoch:		0
+Name:           gnu-getopt
+Version:        1.0.13
+Release:        3.1%{?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
-BuildRequires:  ant
+URL:            http://www.urbanophile.com/arenn/hacking/download.html
+Source0:        http://www.urbanophile.com/arenn/hacking/getopt/java-getopt-%{version}.tar.gz
+Source2:        gnu-getopt-%{version}.pom
 Group:          Development/Libraries/Java
-%if ! %{gcj_support}
-Buildarch:      noarch
-%endif
-BuildRequires:	jpackage-utils >= 0:1.6
-Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
-Provides:	gnu.getopt = %{epoch}:%{version}-%{release}
-Obsoletes:	gnu.getopt <= 0:1.0.9
-
-%if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
-%endif
+Provides:       gnu.getopt = %{epoch}:%{version}-%{release}
+Obsoletes:      gnu.getopt < %{epoch}:%{version}-%{release}
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+BuildRequires:  ant
+BuildRequires:  jpackage-utils
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 The GNU Java getopt classes support short and long argument parsing in
@@ -69,130 +60,118 @@ appreciate bug reports as well as hearin
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-BuildRequires:  java-javadoc
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
-Provides:	gnu.getopt-javadoc = %{epoch}:%{version}-%{release}
-Obsoletes:	gnu.getopt-javadoc <= 0:1.0.9
+Provides:       gnu.getopt-javadoc = %{epoch}:%{version}-%{release}
+Obsoletes:      gnu.getopt-javadoc < %{epoch}:%{version}-%{release}
 
 %description javadoc
 %{summary}.
 
 %prep
 %setup -q -c
-# Aaron, where did you put my build script :-) ?
-mv gnu/getopt/buildx.xml build.xml
+%{__mv} gnu/getopt/buildx.xml build.xml
 
 %build
-%ant jar javadoc
+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
-(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}
+%{__mkdir_p} %{buildroot}%{_javadir}
+%{__cp} -p 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)
 
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
+# javadoc
+%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__cp} -pr build/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/gnu.getopt-%{version}
+%{__ln_s} gnu.getopt-%{version} %{buildroot}%{_javadocdir}/gnu.getopt
+
+# poms
+%add_to_maven_depmap gnu-getopt getopt %{version} JPP %{name}
+%add_to_maven_depmap urbanophile java-getopt %{version} JPP %{name}
+%{__install} -D -p -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 %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
+%{__rm} -rf %{buildroot}
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
-%endif
+%update_maven_depmap
 
 %files
 %defattr(0644,root,root,0755)
 %doc gnu/getopt/COPYING.LIB gnu/getopt/README
-%{_javadir}/*
-
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/gnu-getopt-1.0.12.jar.*
-%endif
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_javadir}/gnu.getopt-%{version}.jar
+%{_javadir}/gnu.getopt.jar
+%{_datadir}/maven2/poms/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+%{_javadocdir}/gnu.getopt-%{version}
+%{_javadocdir}/gnu.getopt
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.12-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0.12-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Sep 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0.13-3.1
+- remove repolib
 
-* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.0.12-5
-- drop repotag
+* Tue Sep 08 2009 David Walluck <dwalluck at redhat.com> 0:1.0.13-3
+- fix maven depmap install
+- add compat symlinks for javadoc
+- add depmap entry for urbanophile:java-getopt
 
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.0.12-4jpp.1
-- Autorebuild for GCC 4.3
+* 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 
 
-* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-3jpp.1
-- Merge with upstream
+* Wed Jul 29 2009 Yong Yang <yyang at redhat.com> 0:1.0.13-1
+- 1.0.13
 
-* Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-3jpp
-- Add requires for post and postun javadoc
+* Wed Aug 20 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-6
+- call %%update_maven_depmap
 
-* Fri Jul 21 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-2jpp_1fc
-- Merge with upstream
+* Wed Aug 20 2008 David Walluck <dwalluck at redhat.com> 0:1.0.12-5
+- add pom
+- fix component-info.xml
 
-* Fri Jul 21 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-2jpp
-- Add versions to backward compatibility Obsoletes/Provides
-- Add AOT bits
+* 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
 
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.0.9-4jpp_5fc
-- rebuild
+* Thu May 29 2008 Permaine Cheung <pcheung at redhat.com> 0:1.0.12-2
+- First JPP 5 build
 
-* Thu May 04 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0.12-1jpp
-- 1.0.12
-- Change name to gnu-getopt, Provide/Obsolete gnu.getopt
-- Still provide gnu.getopt.jar as symlink
-
-* Mon Mar  6 2006 Jeremy Katz <katzj at redhat.com> - 0:1.0.9-4jpp_4fc
-- stop scriptlet spew
+* Tue Mar 13 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0.12-1jpp.ep1.2
+- Fix repolib location
 
-* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> 0:1.0.9-4jpp_3fc
-- rebuilt again
+* Tue Mar 13 2007 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-1jpp.ep1.1
+- New repolib location
 
-* Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
+* Mon Feb 19 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0.12-1jpp.el4ep1.2
+- Add -brew suffix
 
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt
+* Fri Feb 16 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0.12-1jpp.el4ep1.1
+- Add repolib support
 
-* Tue Jun 21 2005 Gary Benson <gbenson at redhat.com> 0:1.0.9-4jpp_2fc
-- Remove classes from the tarball.
+* Tue May 23 2006 Fernando Nasser <fnasser at redhat.com> 0:1.0.12-1jpp_1rh
+- First Red Hat build with new name
 
-* Fri Jan 21 2005 Gary Benson <gbenson at redhat.com> 0:1.0.9-4jpp_1fc
-- Build into Fedora.
+* Thu May 04 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0.12-1jpp
+- 1.0.12
+- Change name to gnu-getopt, Provide/Obsolete gnu.getopt
+- Still provide gnu.getopt.jar as symlink
 
 * Tue Dec 07 2004 David Walluck <david at jpackage.org> 0:1.0.10-1jpp
 - 1.0.10
@@ -200,10 +179,6 @@ fi
 * Mon Aug 23 2004 Ralph Apel <r.apel at r-apel.de> 0:1.0.9-5jpp
 - Build with ant-1.6.2
 
-* Fri Mar  5 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.0.9-4jpp_1rh
-- RH vacuuming
-- GetoptDemo package fix
-
 * Fri May 09 2003 David Walluck <david at anti-microsoft.org> 0:1.0.9-4jpp
 - fix groups
 
@@ -213,11 +188,11 @@ fi
 * Wed Mar 26 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.0.9-2jpp
 - For jpackage-utils 1.5
 
-* Sat Feb 16 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.9-1jpp 
+* 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 
+* Sat Jan 19 2002 Guillaume Rousse <guillomovitch at users.sourceforge.net> 1.0.8-2jpp
 - versioned dir for javadoc
 - no dependencies for javadoc package
 - additional sources in individual archives


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnu-getopt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	23 May 2006 18:42:39 -0000	1.2
+++ sources	9 Sep 2009 14:18:11 -0000	1.3
@@ -1 +1 @@
-a6ca4f494e1287e6b9733762583b51ca  java-getopt-1.0.12.tar.gz
+46336d9bc055900f0320e5c378d7bfb2  java-getopt-1.0.13.tar.gz


