[Jpackage-commits] rpms/free/apache-commons-httpclient apache-commons-httpclient-jpp-depmap.xml, 1.1, 1.2 apache-commons-httpclient.spec, 1.3, 1.4

jpackage jpackage at ryu.zarb.org
Thu Dec 9 00:56:18 CET 2010


Update of /home/projects/jpackage/cvs/rpms/free/apache-commons-httpclient
In directory ryu.zarb.org:/tmp/0vx22a4rH2/rpms/free/apache-commons-httpclient

Modified Files:
	apache-commons-httpclient-jpp-depmap.xml 
	apache-commons-httpclient.spec 
Log Message:
3.1-6.jpp6

Index: apache-commons-httpclient-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/apache-commons-httpclient/apache-commons-httpclient-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** apache-commons-httpclient-jpp-depmap.xml	12 Sep 2010 12:01:10 -0000	1.1
--- apache-commons-httpclient-jpp-depmap.xml	8 Dec 2010 23:56:15 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  <dependencies>
+ <!--
      <dependency>
          <maven>
***************
*** 60,62 ****
--- 61,77 ----
          </jpp>
      </dependency>
+ -->
+     <dependency>
+         <maven>
+             <groupId>velocity</groupId>
+             <artifactId>velocity</artifactId>
+             <version>1.4</version>
+         </maven>
+         <jpp>
+             <groupId>JPP</groupId>
+             <artifactId>velocity14</artifactId>
+             <version>1.4</version>
+         </jpp>
+     </dependency>
+ 
  </dependencies>

Index: apache-commons-httpclient.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/apache-commons-httpclient/apache-commons-httpclient.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** apache-commons-httpclient.spec	9 Oct 2010 10:20:00 -0000	1.3
--- apache-commons-httpclient.spec	8 Dec 2010 23:56:16 -0000	1.4
***************
*** 55,59 ****
  Name:           apache-commons-httpclient
  Version:        3.1
! Release:        5%{?dist}
  Epoch:          1
  Summary:        Apache Commons HTTPClient Package
--- 55,59 ----
  Name:           apache-commons-httpclient
  Version:        3.1
! Release:        6%{?dist}
  Epoch:          1
  Summary:        Apache Commons HTTPClient Package
***************
*** 264,270 ****
    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
  %endif
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|apache-|jakarta-|g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
  # compat symlink
  pushd $RPM_BUILD_ROOT%{_javadir}
--- 264,273 ----
    $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
! 
  # compat symlink
  pushd $RPM_BUILD_ROOT%{_javadir}
***************
*** 373,376 ****
--- 376,382 ----
  
  %changelog
+ * Wed Dec 08 2010 Ralph Apel <r.apel at r-apel.de> 1:3.1-6
+ - Fix compat symlinks for jakarta-commons-httpclient
+ 
  * Sat Oct 09 2010 Ralph Apel <r.apel at r-apel.de> 1:3.1-5
  - Provide compat symlinks for jakarta-commons-httpclient




More information about the JPackage-commits mailing list