[RPM (6.0)] xmlrpc-3.1.3-5.jpp6

Ralph Apel <[email protected]> Fri, 18 Jul 2014 09:23:24 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : xmlrpc                       Relocations: (not relocatable)
Version     : 3.1.3                             Vendor: JPackage Project
Release     : 5.jpp6                        Build Date: Fri 18 Jul 2014 09:13:26 AM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Java              Source RPM: (none)
Size        : 244591                           License: ASL 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://ws.apache.org/xmlrpc/
Summary     : Java XML-RPC implementation
Description :
Apache XML-RPC is a Java implementation of XML-RPC, a popular protocol
that uses XML over HTTP to implement remote procedure calls.
Apache XML-RPC was previously known as Helma XML-RPC. If you have code
using the Helma library, all you should have to do is change the import
statements in your code from helma.xmlrpc.* to org.apache.xmlrpc.*.

---------------
Ralph Apel <[email protected]> 0:3.1.3-5
- fix pom namings
---------------

---------------
Index: xmlrpc-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xmlrpc/xmlrpc-jpp-depmap.xml,v
retrieving revision 1.2
diff -u -r1.2 xmlrpc-jpp-depmap.xml
--- xmlrpc-jpp-depmap.xml	22 Dec 2010 10:54:15 -0000	1.2
+++ xmlrpc-jpp-depmap.xml	18 Jul 2014 07:23:23 -0000
@@ -76,7 +76,7 @@
 			<version>0.5.2</version>
 		</jpp>
 	</dependency>
-
+<!--
         <dependency>
                 <maven>
                         <groupId>org.apache.maven</groupId>
@@ -89,5 +89,31 @@
                         <version>1.0</version>
                 </jpp>
         </dependency>
+-->
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.shared</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.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: xmlrpc-pom_xml.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xmlrpc/xmlrpc-pom_xml.patch,v
retrieving revision 1.2
diff -u -r1.2 xmlrpc-pom_xml.patch
--- xmlrpc-pom_xml.patch	22 Dec 2010 10:54:15 -0000	1.2
+++ xmlrpc-pom_xml.patch	18 Jul 2014 07:23:23 -0000
@@ -1,44 +1,18 @@
---- pom.xml.sav	2006-08-30 22:20:49.000000000 +0200
-+++ pom.xml	2007-08-06 13:11:56.000000000 +0200
-@@ -219,11 +219,25 @@
-                     </execution>
-                 </executions>
-             </plugin>
-+            <plugin>
-+                <groupId>org.apache.maven.plugins</groupId>
-+                <artifactId>maven-site-plugin</artifactId>
-+                <configuration>
-+                    <siteDirectory>${basedir}/src/site</siteDirectory>
-+                </configuration>
-+            </plugin>
-         </plugins>
-     </build>
-     <dependencyManagement>
-         <dependencies>
-             <dependency>
-+                <groupId>commons-codec</groupId>
-+                <artifactId>commons-codec</artifactId>
-+                <version>1.3</version>
-+                <type>jar</type>
-+                <scope>provided</scope>
-+            </dependency>
-+            <dependency>
-                 <groupId>commons-httpclient</groupId>
-                 <artifactId>commons-httpclient</artifactId>
-                 <version>3.0.1</version>
-@@ -270,6 +284,7 @@
- 					<aggregate>true</aggregate>
- 				</configuration>
-             </plugin>
-+<!--
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-changes-plugin</artifactId>
-@@ -281,6 +296,7 @@
-                     </reportSet>
-                 </reportSets>
-             </plugin>
-+-->
-         </plugins>
-     </reporting>
-     <distributionManagement>
+--- pom.xml.sav	2014-07-17 10:16:37.373465816 +0200
++++ pom.xml	2014-07-17 10:16:52.100514903 +0200
+@@ -386,6 +386,7 @@
+           </reportSet>
+         </reportSets>
+       </plugin>
++      <!--
+       <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-changes-plugin</artifactId>
+@@ -398,6 +399,7 @@
+           </reportSet>
+         </reportSets>
+       </plugin>
++      -->
+       <plugin>
+         <groupId>org.apache.rat</groupId>
+         <artifactId>apache-rat-plugin</artifactId>
Index: xmlrpc.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/xmlrpc/xmlrpc.spec,v
retrieving revision 1.7
diff -u -r1.7 xmlrpc.spec
--- xmlrpc.spec	15 Jun 2011 00:31:40 -0000	1.7
+++ xmlrpc.spec	18 Jul 2014 07:23:23 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2011, JPackage Project
+# Copyright (c) 2000-2014, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
 
 Name:           xmlrpc
 Version:        3.1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Java XML-RPC implementation
 License:        ASL 2.0
@@ -51,42 +51,39 @@
 Patch0:         xmlrpc-pom_xml.patch
 Patch1:         xmlrpc-tests-pom_xml.patch
 Patch2:         xmlrpc-site_xml.patch
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-Requires:       jakarta-commons-codec
-Requires:       jakarta-commons-httpclient
-Requires:       jakarta-commons-logging
+Requires:       apache-commons-codec
+Requires:       apache-commons-httpclient
+Requires:       apache-commons-logging
 Requires:       servlet_2_5_api
 Requires:       ws-commons-util
 BuildRequires:  jpackage-utils >= 0:1.7.5
 BuildRequires:  java-devel >= 0:1.6.0
 BuildRequires:  ant >= 0:1.7.1
 BuildRequires:  junit
-BuildRequires:  jakarta-commons-codec
-BuildRequires:  jakarta-commons-httpclient
-BuildRequires:  jakarta-commons-logging
+BuildRequires:  apache-commons-codec
+BuildRequires:  apache-commons-httpclient
+BuildRequires:  apache-commons-logging
 BuildRequires:  servlet_2_5_api
 BuildRequires:  ws-commons-util
 %if %with maven
 BuildRequires:  maven2
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-changes
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-eclipse
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-changes-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-eclipse-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-resources-plugin
 BuildRequires:  velocity15
-BuildRequires:  maven2-plugin-site
-BuildRequires:  maven2-plugin-source
-BuildRequires:  maven2-plugin-surefire
-BuildRequires:  maven2-default-skin
+BuildRequires:  maven-site-plugin
+BuildRequires:  maven-source-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit3
+BuildRequires:  maven-skins
 BuildRequires:  maven-release
 BuildRequires:  apache-commons-parent
 BuildRequires:  apache-rat
-BuildRequires:  liberation-fonts
-BuildRequires:  xmlrpc
 %endif
 Buildarch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -117,7 +114,7 @@
 
 %prep
 %setup -q -n apache-%{name}-%{version}-src
-
+%patch0 -b .sav0
 cp -p %{SOURCE1} settings.xml
 cp -p %{SOURCE3} build.xml
 cp -p %{SOURCE4} client/build.xml
@@ -168,13 +165,14 @@
 
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -m 644 xmlrpc-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlrpc-%{version}.jar
+install -m 644 xmlrpc-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xmlrpc-%{version}.jar
 install -m 644 common/target/xmlrpc-common-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlrpc-common-%{version}.jar
 install -m 644 client/target/xmlrpc-client-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlrpc-client-%{version}.jar
 install -m 644 server/target/xmlrpc-server-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlrpc-server-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)
+(cd $RPM_BUILD_ROOT%{_javadir}/ && for jar in *-%{version}*; do ln -s ${jar} ${jar/-%{version}/}; done)
 
-%add_to_maven_depmap org.apache.xmlrpc xmlrpc %{version} JPP/%{name} xmlrpc
+%add_to_maven_depmap org.apache.xmlrpc xmlrpc %{version} JPP %{name}
 %add_to_maven_depmap org.apache.xmlrpc xmlrpc-client %{version} JPP/%{name} xmlrpc-client
 %add_to_maven_depmap org.apache.xmlrpc xmlrpc-common %{version} JPP/%{name} xmlrpc-common
 %add_to_maven_depmap org.apache.xmlrpc xmlrpc-server %{version} JPP/%{name} xmlrpc-server
@@ -182,9 +180,9 @@
 # poms
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-install -m 644 client/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-client.pom
-install -m 644 common/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-common.pom
-install -m 644 server/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-server.pom
+install -m 644 client/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-xmlrpc-client.pom
+install -m 644 common/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-xmlrpc-common.pom
+install -m 644 server/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-xmlrpc-server.pom
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -220,18 +218,18 @@
 %doc LICENSE.txt
 %dir %{_javadir}*/%{name}
 %exclude %dir %{_javadocdir}/%{name}
-%{_javadir}*/%{name}/xmlrpc-%{version}.jar
+%{_javadir}*/xmlrpc-%{version}.jar
 %{_javadir}*/%{name}/xmlrpc-client-%{version}.jar
 %{_javadir}*/%{name}/xmlrpc-client.jar
 %{_javadir}*/%{name}/xmlrpc-common-%{version}.jar
 %{_javadir}*/%{name}/xmlrpc-common.jar
 %{_javadir}*/%{name}/xmlrpc-server-%{version}.jar
 %{_javadir}*/%{name}/xmlrpc-server.jar
-%{_javadir}*/%{name}/xmlrpc.jar
+%{_javadir}*/xmlrpc.jar
 %{_datadir}/maven2/poms/JPP-xmlrpc.pom
-%{_datadir}/maven2/poms/JPP.xmlrpc-client.pom
-%{_datadir}/maven2/poms/JPP.xmlrpc-common.pom
-%{_datadir}/maven2/poms/JPP.xmlrpc-server.pom
+%{_datadir}/maven2/poms/JPP.xmlrpc-xmlrpc-client.pom
+%{_datadir}/maven2/poms/JPP.xmlrpc-xmlrpc-common.pom
+%{_datadir}/maven2/poms/JPP.xmlrpc-xmlrpc-server.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
@@ -246,6 +244,9 @@
 %endif
 
 %changelog
+* Thu Jul 17 2014 Ralph Apel <[email protected]> 0:3.1.3-5
+- fix pom namings
+
 * Tue Jun 14 2011 David Walluck <[email protected]> 0:3.1.3-4
 - fix build