rpms/jdom/devel jdom-cleanup-pom.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 jdom-crosslink.patch, 1.1, 1.2 jdom.spec, 1.24, 1.25 sources, 1.5, 1.6

mef mef at fedoraproject.org
Fri Feb 5 12:43:32 UTC 2010


Author: mef

Update of /cvs/pkgs/rpms/jdom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20935

Modified Files:
	.cvsignore jdom-crosslink.patch jdom.spec sources 
Added Files:
	jdom-cleanup-pom.patch 
Log Message:
Update to 1.1.1 and add Maven metadata

jdom-cleanup-pom.patch:
 jdom-1.1.pom |   40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

--- NEW FILE jdom-cleanup-pom.patch ---
--- jdom-1.1.pom.orig	2010-02-05 11:25:52.525720695 +0000
+++ jdom-1.1.pom	2010-02-05 11:26:53.387657825 +0000
@@ -4,7 +4,7 @@
 
   <groupId>org.jdom</groupId>
   <artifactId>jdom</artifactId>
-  <version>1.1</version>
+  <version>1.1.1</version>
   <packaging>jar</packaging>
 
   <name>JDOM</name>
@@ -20,42 +20,4 @@
     <connection>scm:cvs:pserver:anonymous at cvs.jdom.org:/home/cvspublic:jdom</connection>
   </scm>
 
-  <dependencies>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-      <version>2.6.1</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jaxen-core</artifactId>
-      <version>1.0-FCS</version>  <!-- patched 1.0-FCS -->
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jaxen-jdom</artifactId>
-      <version>1.0-FCS</version>  <!-- patched 1.0-FCS -->
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>saxpath</artifactId>
-      <version>1.0-FCS</version>  <!-- patched 1.0-FCS -->
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.5.D1</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
 </project>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/jdom/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	9 Jun 2005 13:56:12 -0000	1.5
+++ .cvsignore	5 Feb 2010 12:43:31 -0000	1.6
@@ -1,4 +1 @@
-jdom-1.0-RHCLEAN.tar.bz2
-jdom-1.0
-noarch
-*.src.rpm
+jdom-1.1.1.tar.gz

jdom-crosslink.patch:
 build.xml |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: jdom-crosslink.patch
===================================================================
RCS file: /cvs/pkgs/rpms/jdom/devel/jdom-crosslink.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- jdom-crosslink.patch	18 Oct 2004 20:44:18 -0000	1.1
+++ jdom-crosslink.patch	5 Feb 2010 12:43:31 -0000	1.2
@@ -1,11 +1,11 @@
---- build.xml.orig	2004-09-07 09:01:29.000000000 +0200
-+++ build.xml	2004-09-07 09:04:19.000000000 +0200
-@@ -266,7 +266,7 @@
-              bottom="Copyright &#169; ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
-       <classpath refid="run.class.path"/>
- 
--      <link href="http://java.sun.com/j2se/1.4/docs/api"/>
-+      <link href="${j2se.apidoc}"/>
-     </javadoc>
-   </target>
- 
+--- build.xml.orig	2010-02-05 12:37:26.594658382 +0000
++++ build.xml	2010-02-05 12:38:09.201658171 +0000
+@@ -277,7 +277,7 @@
+              bottom="Copyright &#169; ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved.">
+       <classpath refid="run.class.path"/>
+ 
+-      <link href="http://java.sun.com/j2se/1.4/docs/api"/>
++      <link href="${j2se.apidoc}"/>
+     </javadoc>
+   </target>
+ 


Index: jdom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jdom/devel/jdom.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- jdom.spec	25 Jul 2009 03:59:01 -0000	1.24
+++ jdom.spec	5 Feb 2010 12:43:31 -0000	1.25
@@ -35,17 +35,19 @@
 %define section free
 
 Name:           jdom
-Version:        1.0
-Release:        7.5%{?dist}
+Version:        1.1.1
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Java alternative to DOM and SAX
 License:        BSD
 URL:            http://www.jdom.org/
 Group:          Development/Libraries/Java
-#http://www.jdom.org/dist/source/jdom-1.0.tar.gz
-Source0:        jdom-1.0-RHCLEAN.tar.bz2
+Source0:        http://jdom.org/dist/binary/jdom-1.1.1.tar.gz
+Source1:        http://repo1.maven.org/maven2/org/jdom/jdom/1.1/jdom-1.1.pom
 Patch0:         %{name}-crosslink.patch
-Patch1:         %{name}-%{version}-OSGiManifest.patch
+Patch1:         %{name}-1.0-OSGiManifest.patch
+# Change version number and remove dependencies that don't have POMs yet
+Patch2:         %{name}-cleanup-pom.patch
 Requires:       xalan-j2 >= 0:2.2.0
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  xalan-j2 >= 0:2.2.0
@@ -73,6 +75,7 @@ and SAX.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
+BuildArch:      noarch
 # for /bin/rm and /bin/ln
 Requires(post):   coreutils
 Requires(postun): coreutils
@@ -84,15 +87,18 @@ Javadoc for %{name}.
 Summary:        Demos for %{name}
 Group:          Development/Libraries/Java
 Requires:       %{name} = %{epoch}:%{version}-%{release}
+BuildArch:      noarch
 
 %description demo
 Demonstrations and samples for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}
+cp %{SOURCE1} .
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;
@@ -120,6 +126,11 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+# maven stuff
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+cp jdom-1.1.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jdom.pom
+%add_to_maven_depmap org.jdom %{name} %{version} JPP %{name}
+
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -138,30 +149,34 @@ if [ "$1" = "0" ]; then
     rm -f %{_javadocdir}/%{name}
 fi
 
-%if %{gcj_support}
 %post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
+%update_maven_depmap
+%if %{gcj_support}
+  if [ -x %{_bindir}/rebuild-gcj-db ] 
+  then
+    %{_bindir}/rebuild-gcj-db
+  fi
 %endif
 
-%if %{gcj_support}
 %postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
-  %{_bindir}/rebuild-gcj-db
-fi
+%update_maven_depmap
+%if %{gcj_support}
+  if [ -x %{_bindir}/rebuild-gcj-db ] 
+  then
+    %{_bindir}/rebuild-gcj-db
+  fi
 %endif
 
+
 %files
 %defattr(0644,root,root,0755)
 %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt
 %{_javadir}/%{name}*.jar
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/*.pom
 
 %if %{gcj_support}
-%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/jdom-1.0.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}
 %endif
 
 %files javadoc
@@ -175,6 +190,11 @@ fi
 
 
 %changelog
+* Fri Feb  5 2010 Mary Ellen Foster <mefoster at gmail.com> 1.1.1-1
+- Update to 1.1.1
+- Add maven dependency information
+- Make javadoc and demo subpackages noarch
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-7.5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/jdom/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	22 Jun 2005 08:46:33 -0000	1.5
+++ sources	5 Feb 2010 12:43:31 -0000	1.6
@@ -1 +1 @@
-98a554b81b2600cd53f95c0c9172e1c7  jdom-1.0-RHCLEAN.tar.bz2
+0ad116194e3101fb08fab8f6f00cc58f  jdom-1.1.1.tar.gz



More information about the scm-commits mailing list