[Jpackage-commits] dist/not-yet-commons-ssl/JPP-6 not-yet-commons-ssl.spec, 1.3, 1.4

David Walluck david at ryu.zarb.org
Wed Jul 1 21:53:24 CEST 2009


Update of /home/projects/jpackage/cvs/dist/not-yet-commons-ssl/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv2452

Modified Files:
	not-yet-commons-ssl.spec 
Log Message:
- build for JPP-6

Index: not-yet-commons-ssl.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/not-yet-commons-ssl/JPP-6/not-yet-commons-ssl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** not-yet-commons-ssl.spec	12 Jun 2009 10:20:37 -0000	1.3
--- not-yet-commons-ssl.spec	1 Jul 2009 19:53:22 -0000	1.4
***************
*** 33,46 ****
  Name:           not-yet-commons-ssl
  Version:        0.3.10
! Release:        1%{?dist}
  Epoch:          0
  Summary:        Commons SSL
- 
  Group:          Development/Libraries/Java
! License:        Apache License 2.0
  URL:            http://juliusdavies.ca/commons-ssl/
  Source0:        http://juliusdavies.ca/commons-ssl/not-yet-commons-ssl-0.3.10.zip
  Source1:        not-yet-commons-ssl-0.3.10.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildArch:      noarch
--- 33,45 ----
  Name:           not-yet-commons-ssl
  Version:        0.3.10
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Commons SSL
  Group:          Development/Libraries/Java
! License:        ASL 2.0
  URL:            http://juliusdavies.ca/commons-ssl/
  Source0:        http://juliusdavies.ca/commons-ssl/not-yet-commons-ssl-0.3.10.zip
  Source1:        not-yet-commons-ssl-0.3.10.pom
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  BuildArch:      noarch
***************
*** 76,80 ****
  
  %build
! ant \
    -Dlib=%{_javadir} \
    -Dhttpclient-jar=commons-httpclient.jar \
--- 75,81 ----
  
  %build
! export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}`
! export CLASSPATH=
! %{ant} \
    -Dlib=%{_javadir} \
    -Dhttpclient-jar=commons-httpclient.jar \
***************
*** 85,100 ****
  %install
  rm -rf $RPM_BUILD_ROOT
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 build/commons-ssl.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! install -m 644 build/commons-ssl-tests.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-tests-%{version}.jar
  (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
- ln -sf %{name}.jar  $RPM_BUILD_ROOT%{_javadir}/commons-ssl.jar
  
  # 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 org.apache.commons %{name} %{version} JPP %{name}
  
--- 86,102 ----
  %install
  rm -rf $RPM_BUILD_ROOT
+ 
  # jars
  install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 build/commons-ssl.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-ssl-%{version}.jar
! install -p -m 644 build/commons-ssl-tests.jar \
    $RPM_BUILD_ROOT%{_javadir}/%{name}-tests-%{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 org.apache.commons %{name} %{version} JPP %{name}
  
***************
*** 102,106 ****
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 104,108 ----
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean
***************
*** 114,129 ****
  
  %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:0.3.10-1.jpp5
  - First release
-  
--- 116,138 ----
  
  %files
! %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/commons-ssl-%{version}.jar
! %{_javadir}/commons-ssl.jar
! %{_javadir}/%{name}-tests-%{version}.jar
! %{_javadir}/%{name}-tests.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{version}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Wed Jul 01 2009 David Walluck <dwalluck at redhat.com> 0:0.3.10-2
+ - build for JPP-6
+ 
  * Fri Jun 12 2009 Ralph Apel <r.apel at r-apel.de> - 0:0.3.10-1.jpp5
  - First release




More information about the JPackage-commits mailing list