SPECS: concurrent.spec - unifu java package; rel 1

glen glen at pld-linux.org
Wed Dec 12 20:17:43 CET 2007


Author: glen                         Date: Wed Dec 12 19:17:43 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unifu java package; rel 1

---- Files affected:
SPECS:
   concurrent.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/concurrent.spec
diff -u SPECS/concurrent.spec:1.2 SPECS/concurrent.spec:1.3
--- SPECS/concurrent.spec:1.2	Tue Nov 20 18:53:59 2007
+++ SPECS/concurrent.spec	Wed Dec 12 20:17:37 2007
@@ -3,7 +3,7 @@
 Summary:	Utility classes for concurrent Java programming
 Name:		concurrent
 Version:	1.3.2
-Release:	0.1
+Release:	1
 Epoch:		0
 License:	Public domain
 Source0:	http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/%{name}.tar.gz
@@ -15,6 +15,7 @@
 BuildRequires:	jpackage-utils >= 0:1.5
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,18 +51,18 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-install %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/
+install %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
+cp -a docs/* $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}
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -69,8 +70,8 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -78,9 +79,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2007-12-12 19:17:37  glen
+- unifu java package; rel 1
+
 Revision 1.2  2007-11-20 17:53:59  glen
 - java deps
 
 Revision 1.1  2007-11-18 14:41:56  glen
 - new, based on jpackage
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/concurrent.spec?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list