SPECS: java-xml-commons.spec - renamed from xml-commons.spec

[pawelz]

Author: pawelz                       Date: Fri Jan 30 11:07:10 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renamed from xml-commons.spec

---- Files affected:
SPECS:
   java-xml-commons.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/java-xml-commons.spec
diff -u SPECS/java-xml-commons.spec:1.20 SPECS/java-xml-commons.spec:1.21
--- SPECS/java-xml-commons.spec:1.20	Wed Jan 28 11:16:05 2009
+++ SPECS/java-xml-commons.spec	Fri Jan 30 12:07:04 2009
@@ -1,18 +1,19 @@
 # $Revision$, $Date$
 %define		_beta	b2
 %define		_rel	3
+%define		srcname	xml-commons
 %include	/usr/lib/rpm/macros.java
-Summary:	Common code for XML projects
-Summary(pl.UTF-8):	Wspólny kod dla projektów XML
-Name:		xml-commons
+Summary:	Common code for Apache XML projects
+Summary(pl.UTF-8):	Wspólny kod dla projektów Apache XML
+Name:		java-%{srcname}
 Version:	1.0
 Release:	0.%{_beta}.%{_rel}
 License:	Apache
 Group:		Development/Languages/Java
-Source0:	http://www.apache.org/dist/xml/commons/%{name}-%{version}.%{_beta}.tar.gz
+Source0:	http://www.apache.org/dist/xml/commons/%{srcname}-%{version}.%{_beta}.tar.gz
 # Source0-md5:	6c6551ece56948ee535d5f5014489b8d
-Patch0:		%{name}.build.patch
-Patch1:		%{name}.manifest.patch
+Patch0:		%{srcname}.build.patch
+Patch1:		%{srcname}.manifest.patch
 URL:		http://xml.apache.org/commons/
 # ant >= 1.7.1-3 is required because of ant-gcjtask.patch
 BuildRequires:	ant >= 1.7.1-3
@@ -22,6 +23,8 @@
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
 Requires:	jpackage-utils
+Provides:	%{srcname}
+Obsoletes:	%{srcname}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,6 +50,7 @@
 Summary(pl.UTF-8):	Dokumentacja online dla xml-commons
 Group:		Documentation
 Requires:	jpackage-utils
+Obsoletes:	xml-commons
 
 %description javadoc
 Documentation for xml-commons.
@@ -55,7 +59,7 @@
 Dokumentacja dla xml-commons.
 
 %prep
-%setup -q -n %{name}-%{version}.%{_beta}
+%setup -q -n %{srcname}-%{version}.%{_beta}
 
 %{__sed} -i -e 's,\r$,,' build.xml
 %{__sed} -i -e 's,\r$,,' java/which.xml
@@ -72,22 +76,22 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-install java/external/build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-apis-%{version}.jar
-install java/build/which.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-which-%{version}.jar
+install java/external/build/xml-apis.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-apis-%{version}.jar
+install java/build/which.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-which-%{version}.jar
 
-ln -s %{name}-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-apis.jar
-ln -s %{name}-which-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-which.jar
+ln -s %{srcname}-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-apis.jar
+ln -s %{srcname}-which-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-which.jar
 
 # javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a java/external/build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a java/external/build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
@@ -96,8 +100,8 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -105,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2009/01/30 11:07:04  pawelz
+- renamed from xml-commons.spec
+
 Revision 1.20  2009/01/28 10:16:05  pawelz
 - use gcj not sun javac (so now we could build it on i486)
 - BR: gcj, ant >= 1.7.1-3 (because of ant-gcjtask.patch)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xml-commons.spec?r1=1.20&r2=1.21&f=u