[Jpackage-commits] dist/apache-commons-daemon/JPP-6 apache-commons-daemon.spec, 1.2, 1.3

jpackage jpackage at ryu.zarb.org
Thu Dec 9 09:23:00 CET 2010


Update of /home/projects/jpackage/cvs/dist/apache-commons-daemon/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv10530

Modified Files:
	apache-commons-daemon.spec 
Log Message:
Fix jakarta compat symlinks

Index: apache-commons-daemon.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/apache-commons-daemon/JPP-6/apache-commons-daemon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** apache-commons-daemon.spec	8 Oct 2010 07:16:27 -0000	1.2
--- apache-commons-daemon.spec	9 Dec 2010 08:22:58 -0000	1.3
***************
*** 57,61 ****
  Name:           apache-%{short_name}
  Version:        1.0.2
! Release:        0.r831676.3%{?dist}
  Epoch:          1
  Summary:        Apache Commons Daemon
--- 57,61 ----
  Name:           apache-%{short_name}
  Version:        1.0.2
! Release:        0.r831676.4%{?dist}
  Epoch:          1
  Summary:        Apache Commons Daemon
***************
*** 75,79 ****
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
--- 75,79 ----
  BuildArch:      noarch
  %endif
! BuildRequires:  jpackage-utils >= 0:1.7.5
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  ant >= 0:1.7
***************
*** 93,98 ****
  BuildRequires:  maven2-plugin-resources
  %endif
! Requires(post): jpackage-utils >= 0:5.0.0
! Requires(postun): jpackage-utils >= 0:5.0.0
  %endif
  Provides:       %{short_name} = %{epoch}:%{version}-%{release}
--- 93,98 ----
  BuildRequires:  maven2-plugin-resources
  %endif
! Requires(post): jpackage-utils >= 0:1.7.5
! Requires(postun): jpackage-utils >= 0:1.7.5
  %endif
  Provides:       %{short_name} = %{epoch}:%{version}-%{release}
***************
*** 207,213 ****
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-|jakarta-|g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # pom
--- 207,215 ----
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}-%{version}.jar
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jakarta-%{short_name}.jar
  
  # pom
***************
*** 215,218 ****
--- 217,221 ----
  %{__cp} -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
  %add_to_maven_depmap commons-daemon commons-daemon %{version} JPP %{name}
+ %add_to_maven_depmap org.apache.commons commons-daemon %{version} JPP %{name}
  
  # javadoc
***************
*** 303,306 ****
--- 306,312 ----
  
  %changelog
+ * Thu Dec 09 2010 Ralph Apel <r.apel at r-apel.de> 1:1.0.2-0.r831676.4
+ - Fix compat symlinks for jakarta-commons-daemon
+ 
  * Fri Oct 08 2010 Ralph Apel <r.apel at r-apel.de> 1:1.0.2-0.r831676.3
  - Provide compat symlinks for jakarta-commons-daemon




More information about the JPackage-commits mailing list