SPECS: commons-el.spec - renamed to jakarta-commons-el - svn admin...

[glen]

Author: glen                         Date: Wed Apr 11 23:41:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renamed to jakarta-commons-el
- svn admin plz rename commons-el.spec,v

---- Files affected:
SPECS:
   commons-el.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/commons-el.spec
diff -u SPECS/commons-el.spec:1.3 SPECS/commons-el.spec:1.4
--- SPECS/commons-el.spec:1.3	Wed Apr 11 22:49:20 2007
+++ SPECS/commons-el.spec	Thu Apr 12 01:41:21 2007
@@ -1,16 +1,18 @@
 # $Revision$, $Date$
+# TODO
+# spec vs Name
 %include	/usr/lib/rpm/macros.java
 Summary:	The Jakarta Commons Extension Language
 Summary(pl.UTF-8):	Jakarta Commons Extension Language - język rozszerzeń Jakarta Commons
-Name:		commons-el
+Name:		jakarta-commons-el
 Version:	1.0
 Release:	1
 License:	Apache Software License
 Group:		Development/Languages/Java
-Source0:	http://www.apache.org/dist/jakarta/commons/el/source/%{name}-%{version}-src.tar.gz
+Source0:	http://www.apache.org/dist/jakarta/commons/el/source/commons-el-%{version}-src.tar.gz
 # Source0-md5:	25038283a0b5f638db5e891295d20020
-Patch0:		%{name}-license.patch
-Patch1:		%{name}-ant.patch
+Patch0:		commons-el-license.patch
+Patch1:		commons-el-ant.patch
 URL:		http://jakarta.apache.org/commons/el/
 BuildRequires:	ant
 BuildRequires:	jpackage-utils >= 0:1.6
@@ -19,6 +21,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	jsp
 BuildRequires:	servletapi5
+Obsoletes:	commons-el
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,19 +34,20 @@
 javax.servlet.jsp.el, będących częścią specyfikacji JSP 2.0.
 
 %package javadoc
-Summary:	Javadoc for %{name}
+Summary:	Javadoc for commons-el
 Summary(pl.UTF-8):	Dokumentacja javadoc dla commons-el
 Group:		Documentation
 Requires:	jpackage-utils
+Obsoletes:	commons-el-javadoc
 
 %description javadoc
-Javadoc for %{name}.
+Javadoc for commons-el.
 
 %description javadoc -l pl.UTF-8
 Dokumentacja javadoc dla commons-el.
 
 %prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n commons-el-%{version}-src
 %patch0 -p1
 %patch1 -p1
 
@@ -75,18 +79,13 @@
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -96,6 +95,7 @@
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +103,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2007/04/11 23:41:21  glen
+- renamed to jakarta-commons-el
+- svn admin plz rename commons-el.spec,v
+
 Revision 1.3  2007/04/11 20:49:20  glen
 - bootstrap not needed anymore
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/commons-el.spec?r1=1.3&r2=1.4&f=u