rpms/batik/devel sources, 1.8, 1.9 batik.spec, 1.10, 1.11 .cvsignore, 1.7, 1.8

[Alexander Kurtakov]

Author: akurtakov

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

Modified Files:
	sources batik.spec .cvsignore 
Log Message:
Install separate jars and put OSGi manifests in them.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/batik/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jan 2009 19:08:45 -0000	1.8
+++ sources	12 Feb 2009 09:34:53 -0000	1.9
@@ -6,3 +6,4 @@
 41e4dcaacf99bb8e583ee3e7e04e662f  batik.rasterizer.script
 26100fd0b228e3466c4e1788589140b3  batik-repack.sh
 207f23ed2d90e9b9982f739398834c4d  batik-repack-1.7.zip
+0a704013b27f1ee5c756ffad3cccdbe8  batik-orbit-manifests.tar.gz


Index: batik.spec
===================================================================
RCS file: /cvs/pkgs/rpms/batik/devel/batik.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- batik.spec	6 Jan 2009 14:54:21 -0000	1.10
+++ batik.spec	12 Feb 2009 09:34:53 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           batik
 Version:        1.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0
 URL:            http://xml.apache.org/batik/
@@ -14,6 +14,7 @@
 Source5:        %{name}.slideshow.script
 Source6:        %{name}-squiggle.desktop
 Source7:       %{name}-repack.sh
+Source8:        %{name}-orbit-manifests.tar.gz
 Patch0:         %{name}-manifests.patch
 Patch1:         %{name}-policy.patch
 Requires:       rhino >= 1.5
@@ -123,6 +124,10 @@
 %patch1 -p1
 rm -f `find -name readOnly.png`
 rm -f `find -name properties`
+mkdir orbit
+pushd orbit
+tar xzf %{SOURCE8}
+popd
 
 
 %build
@@ -133,7 +138,7 @@
 export CLASSPATH=$CLASSPATH:/usr/share/java/rhino.jar
 export CLASSPATH=$CLASSPATH:/usr/share/java/xalan-j2.jar
 export CLASSPATH=$CLASSPATH:/usr/share/java/xerces-j2.jar
-ant all-jar \
+ant all-jar jars\
 	-Ddebug=on \
         -Dsun-codecs.present=false \
         -Dsun-codecs.disabled=true \
@@ -152,8 +157,58 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p orbit/batik-bridge-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-bridge.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-css-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-css.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-dom-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-dom.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-dom-svg-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-svg-dom.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-ext-awt-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-awt-util.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-extension-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-extension.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-parser-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-parser.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-svggen-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-svggen.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-swing-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-swing.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-transcoder-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-transcoder.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-util-gui-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-gui-util.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-util-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-util.jar META-INF/MANIFEST.MF
+cp -p orbit/batik-xml-MANIFEST.MF META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-xml.jar META-INF/MANIFEST.MF
+
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mkdir -p $RPM_BUILD_ROOT%{_javadir}/batik
+pushd %{name}-%{version}/lib
+for jarname in $(find batik-*.jar); do
+    cp -p ${jarname} \
+       $RPM_BUILD_ROOT%{_javadir}/batik/`echo ${jarname}|sed "s|.jar||g"`-%{version}.jar
+done
+popd
+rm -fr $RPM_BUILD_ROOT%{_javadir}/batik/%{name}-all-%{version}.jar
 cp -p %{name}-%{version}/lib/%{name}-all.jar \
        $RPM_BUILD_ROOT%{_javadir}/%{name}-all-%{version}.jar
 cp -p %{name}-%{version}/batik-rasterizer.jar \
@@ -167,6 +222,11 @@
     do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; 
   done
 popd
+pushd $RPM_BUILD_ROOT%{_javadir}/batik
+	for jar in *-%{version}*.jar; do
+      ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; 
+    done
+popd
 
 # scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -201,6 +261,7 @@
 %doc KEYS LICENSE MAINTAIN NOTICE README
 %{_javadir}/%{name}-all-%{version}.jar
 %{_javadir}/%{name}-all.jar
+%{_javadir}/batik
 
 %files squiggle
 %defattr(-,root,root,-)
@@ -238,6 +299,9 @@
 
 
 %changelog
+* Fri Feb 6 2009 Alexander Kurtakov <akurtako at redhat.com> 1.7-3
+- Install separate jars and put OSGi manifests in them.
+
 * Tue Jan 06 2009 Lillian Angel  <langel at redhat.com> - 1.7-2
 - Fixed java dependencies to check for java-1.6.0-openjdk instead.
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/batik/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Jan 2009 19:08:45 -0000	1.7
+++ .cvsignore	12 Feb 2009 09:34:54 -0000	1.8
@@ -6,3 +6,4 @@
 batik.rasterizer.script
 batik-repack.sh
 batik-repack-1.7.zip
+batik-orbit-manifests.tar.gz