[Jpackage-commits] dist/jargs/devel jargs.spec,1.1,1.2

David Walluck david at ryu.zarb.org
Fri Jul 10 18:11:36 CEST 2009


Update of /home/projects/jpackage/cvs/dist/jargs/devel
In directory ryu.zarb.org:/tmp/cvs-serv1899

Modified Files:
	jargs.spec 
Log Message:
- spec cleanup

Index: jargs.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jargs/devel/jargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jargs.spec	12 Jun 2009 10:51:29 -0000	1.1
--- jargs.spec	10 Jul 2009 16:11:33 -0000	1.2
***************
*** 33,46 ****
  Name:           jargs
  Version:        1.0
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Java command line option parsing suite
- 
  Group:          Development/Libraries/Java
! License:        Apache License 2.0
  URL:            http://jargs.sourceforge.net/
  Source0:        http://dl.sourceforge.net/sourceforge/jargs/jargs-1.0.tar.bz2
  Source1:        http://repository.jboss.com/maven2/net/sf/jargs/1.0/jargs-1.0.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:      noarch
--- 33,45 ----
  Name:           jargs
  Version:        1.0
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Java command line option parsing suite
  Group:          Development/Libraries/Java
! License:        ASL 2.0
  URL:            http://jargs.sourceforge.net/
  Source0:        http://dl.sourceforge.net/sourceforge/jargs/jargs-1.0.tar.bz2
  Source1:        http://repository.jboss.com/maven2/net/sf/jargs/1.0/jargs-1.0.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  BuildArch:      noarch
***************
*** 77,98 ****
  %prep
  %setup -q 
! for j in $(find . -name "*.jar"); do
!     mv $j $j.no
! done
  
  %build
! ant 
  
  %install
  rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 lib/jargs.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap net.sf %{name} %{version} JPP %{name}
  %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
--- 76,98 ----
  %prep
  %setup -q 
! find . -name "*.jar" | xargs -t rm
  
  %build
! export OPT_JAR_LIST=:
! export CLASSPATH=
! %{ant}
  
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 lib/jargs.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar | sed "s|-%{version}||g"`; done)
  
  # pom
  install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
! install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap net.sf %{name} %{version} JPP %{name}
  %add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
***************
*** 101,105 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 101,105 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
***************
*** 113,128 ****
  
  %files
! %defattr(-,root,root,-)
! %{_javadir}/*.jar
! %{_datadir}/maven2/poms/*
! %{_mavendepmapfragdir}/*
  
  %files javadoc
! %defattr(-,root,root,-)
! %doc %{_javadocdir}/%{name}-%{version}
! %doc %{_javadocdir}/%{name}
  
  %changelog
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1.jpp5
  - First release
-  
--- 113,131 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Jul 10 2009 David Walluck <dwalluck at redhat.com> 0:1.0-2
+ - spec cleanup
+ 
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1.jpp5
  - First release




More information about the JPackage-commits mailing list