Author: peroyvind
Date: Mon Feb 19 18:20:25 2007
New Revision: 122852
Modified:
packages/cooker/log4j/current/SPECS/log4j.spec
Log:
cleanups
- don't screw up symlinks
- index jar
- add reguires for scriptlets
Modified: packages/cooker/log4j/current/SPECS/log4j.spec
==============================================================================
--- packages/cooker/log4j/current/SPECS/log4j.spec (original)
+++ packages/cooker/log4j/current/SPECS/log4j.spec Mon Feb 19 18:20:25 2007
@@ -4,7 +4,7 @@
Name: log4j
Version: 1.2.14
-Release: %mkrel 1
+Release: %mkrel 2
Epoch: 0
Summary: Java logging package
License: Apache License
@@ -43,6 +43,9 @@
Requires: jpackage-utils >= 0:1.5
Requires: xml-commons-apis
Requires: jaxp_parser_impl
+Requires(post): sgml-common libxml2-utils
+Requires(preun): libxml2-utils
+Requires(postun): sgml-common
Group: Development/Java
%if %{gcj_support}
BuildRequires: gcc-java
@@ -79,7 +82,9 @@
%patch0 -p0
%patch1 -p0
# remove all binary libs
-find . -name "*.jar" -exec %__rm -f {} \;
+find . -name "*.jar" -exec rm -f {} \;
+# fix perl location
+sed -i -e 's|/opt/perl5/bin/perl|%{__perl}|'
contribs/KitchingSimon/udpserver.pl
%build
%if !%{bootstrap}
@@ -88,111 +93,67 @@
export CLASSPATH=$(build-classpath jaf javamail/mailapi)
%endif
-%ant -Djdk.javadoc=%{_javadocdir}/java jar javadoc
+ant -Djdk.javadoc=%{_javadocdir}/java jar javadoc
+if [ -z "`unzip -l dist/lib/%{name}-%{version}.jar |grep META-INF/INDEX.LIST`"
]; then
+ jar -i dist/lib/%{name}-%{version}.jar
+fi
%install
-%__rm -rf %{buildroot}
+rm -rf %{buildroot}
# jars
-%__mkdir_p %{buildroot}%{_javadir}
-%__cp -a dist/lib/%{name}-%{version}.jar %{buildroot}%{_javadir}
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+install -m644 dist/lib/%{name}-%{version}.jar -D
%{buildroot}%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -a docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
-%__rm -rf docs/api
+install -d %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -r docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
# scripts
-%__mkdir_p %{buildroot}%{_bindir}
-%__install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/logfactor5
-%__install -p -m 755 %{SOURCE5} %{buildroot}%{_bindir}/chainsaw
+install -m755 %{SOURCE2} -D %{buildroot}%{_bindir}/logfactor5
+install -m755 %{SOURCE5} -D %{buildroot}%{_bindir}/chainsaw
# freedesktop.org menu entries and icons
-%__mkdir_p %{buildroot}%{_datadir}/{applications,pixmaps}
-%__cp -a %{SOURCE1} \
- %{buildroot}%{_datadir}/pixmaps/logfactor5.png
-%__cp -a %{SOURCE3} \
- %{buildroot}%{_datadir}/applications/jpackage-logfactor5.desktop
-%__cp -a %{SOURCE4} \
- %{buildroot}%{_datadir}/pixmaps/chainsaw.png
-%__cp -a %{SOURCE6} \
- %{buildroot}%{_datadir}/applications/jpackage-chainsaw.desktop
+install -m644 %{SOURCE1} -D %{buildroot}%{_datadir}/pixmaps/logfactor5.png
+install -m644 %{SOURCE3} -D
%{buildroot}%{_datadir}/applications/jpackage-logfactor5.desktop
+install -m644 %{SOURCE4} -D %{buildroot}%{_datadir}/pixmaps/chainsaw.png
+install -m644 %{SOURCE6} -D
%{buildroot}%{_datadir}/applications/jpackage-chainsaw.desktop
# DTD and the SGML catalog (XML catalog handled in scriptlets)
-%__mkdir_p %{buildroot}%{_datadir}/sgml/%{name}
-%__cp -a src/java/org/apache/log4j/xml/log4j.dtd \
- %{buildroot}%{_datadir}/sgml/%{name}
-%__cp -a %{SOURCE7} \
- %{buildroot}%{_datadir}/sgml/%{name}/catalog
-
-# fix perl location
-%__perl -p -i -e 's|/opt/perl5/bin/perl|%{__perl}|' \
-contribs/KitchingSimon/udpserver.pl
+install -m644 src/java/org/apache/log4j/xml/log4j.dtd -D
%{buildroot}%{_datadir}/sgml/%{name}/log4j.dtd
+install -m644 %{SOURCE7} -D %{buildroot}%{_datadir}/sgml/%{name}/catalog
%if %{gcj_support}
aot-compile-rpm
%endif
-# fix end-of-line
-%{__perl} -pi -e 's/\r\n/\n/g'
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/package-list
-%{__perl} -pi -e 's/\r\n/\n/g' INSTALL TODO *.txt contribs/CONTENTS docs/TODO
docs/css/site.css
-
-for dir in contribs docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}; do
- for i in `find "$dir" -type f -name "*.html" -o -name "*.css" -o -name
"*.java" -o -name "mail*" -o -name "*.xml" -o -name "*.txt" -o -name "*.pl"`; do
- %{__perl} -pi -e 's/\r\n/\n/g' "$i"
- done
-done
-
%clean
-%__rm -rf %{buildroot}
+rm -rf %{buildroot}
%post
-# Note that we're using versioned catalog, so this is always ok.
-if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
- %{_bindir}/install-catalog --add \
- %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
- %{_datadir}/sgml/%{name}/catalog > /dev/null || :
-fi
+%{_bindir}/install-catalog --add \
+ %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
+ %{_datadir}/sgml/%{name}/catalog
-if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
- %{_bindir}/xmlcatalog --noout --add system log4j.dtd \
- file://%{_datadir}/sgml/%{name}/log4j.dtd %{_sysconfdir}/xml/catalog \
- > /dev/null || :
-fi
+%{_bindir}/xmlcatalog --noout --add system log4j.dtd \
+ file://%{_datadir}/sgml/%{name}/log4j.dtd %{_sysconfdir}/xml/catalog
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db
%endif
%preun
-if [ $1 -eq 0 ]; then
- if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
- %{_bindir}/xmlcatalog --noout --del log4j.dtd \
- %{_sysconfdir}/xml/catalog > /dev/null || :
- fi
-fi
+%{_bindir}/xmlcatalog --noout --del \
+ log4j.dtd %{_sysconfdir}/xml/catalog
%postun
-# Note that we're using versioned catalog, so this is always ok.
-if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
- %{_bindir}/install-catalog --remove \
- %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
- %{_datadir}/sgml/%{name}/catalog > /dev/null || :
-fi
+%{_bindir}/install-catalog --remove \
+ %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
+ %{_datadir}/sgml/%{name}/catalog
%if %{gcj_support}
%{_bindir}/rebuild-gcj-db
%endif
-%post javadoc
-%__rm -f %{_javadocdir}/%{name}
-%__ln_s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ $1 -eq 0 ]; then
- %__rm -f %{_javadocdir}/%{name}
-fi
-
%files
%defattr(-,root,root,-)
%doc INSTALL LICENSE
@@ -213,4 +174,4 @@
%defattr(0644,root,root,0755)
%dir %{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}-%{version}/*
-%ghost %dir %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}
