Author: peroyvind
Date: Mon Feb 19 18:38:46 2007
New Revision: 122855
Modified:
packages/cooker/jakarta-commons-discovery/current/SPECS/jakarta-commons-discovery.spec
Log:
cleanups
- fix one-line-command-in-*
- index jar file
Modified:
packages/cooker/jakarta-commons-discovery/current/SPECS/jakarta-commons-discovery.spec
==============================================================================
---
packages/cooker/jakarta-commons-discovery/current/SPECS/jakarta-commons-discovery.spec
(original)
+++
packages/cooker/jakarta-commons-discovery/current/SPECS/jakarta-commons-discovery.spec
Mon Feb 19 18:38:46 2007
@@ -1,11 +1,10 @@
%define gcj_support 1
%define short_name commons-discovery
-%define section free
Summary: Jakarta Commons Discovery
Name: jakarta-commons-discovery
Version: 0.3
-Release: %mkrel 2.3
+Release: %mkrel 2.4
Epoch: 1
Group: Development/Java
License: Apache License
@@ -21,9 +20,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
#Vendor: JPackage Project
#Distribution: JPackage
-BuildRequires: ant, jpackage-utils >= 0:1.5
+BuildRequires: ant jpackage-utils >= 0:1.5
BuildRequires: junit >= 0:3.7
BuildRequires: jakarta-commons-logging >= 0:1.0.1
+BuildRequires: dos2unix
Requires: jakarta-commons-logging >= 0:1.0.1
%description
@@ -34,8 +34,6 @@
instantiating classes, and for lifecycle management of singleton (factory)
classes.
-# -----------------------------------------------------------------------------
-
%package javadoc
Group: Development/Java
Summary: Javadoc for %{name}
@@ -43,58 +41,48 @@
%description javadoc
Javadoc for %{name}.
-# -----------------------------------------------------------------------------
-
%prep
%setup -q -n commons-discovery-%{version}
chmod u+w .
# No NOTICE.txt file in the sources
touch NOTICE.txt
-
-# -----------------------------------------------------------------------------
+dos2unix LICENSE.txt
%build
%ant \
-Djunit.jar=$(find-jar junit) \
-Dlogger.jar=$(find-jar jakarta-commons-logging) \
test.discovery dist
-
-# -----------------------------------------------------------------------------
+if [ -z "`unzip -l dist/%{short_name}.jar |grep META-INF/INDEX.LIST`" ]; then
+ jar -i dist/%{short_name}.jar
+fi
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
# jar
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && ln -s %{name}-%{version}.jar
%{short_name}-%{version}.jar && for jar in *-%{version}.jar; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
+install -m644 dist/%{short_name}.jar -D
%{buildroot}%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}.jar
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -r dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
%if %{gcj_support}
aot-compile-rpm
%endif
-# fix end-of-line
-%{__perl} -pi -e 's/\r\n/\n/g' LICENSE.txt
-
-# -----------------------------------------------------------------------------
-
%if %{gcj_support}
-%post
-%{_bindir}/rebuild-gcj-db
+%post -p %{_bindir}/rebuild-gcj-db
-%postun
-%{_bindir}/rebuild-gcj-db
+%postun -p %{_bindir}/rebuild-gcj-db
%endif
%clean
-rm -rf $RPM_BUILD_ROOT
-
-# -----------------------------------------------------------------------------
+rm -rf %{buildroot}
%files
%defattr(0644,root,root,0755)
@@ -107,5 +95,4 @@
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
-
-# -----------------------------------------------------------------------------
+%{_javadocdir}/%{name}
