|
|
Author: pcheung
Update of /cvs/dist/rpms/concurrent/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29643
Modified Files:
concurrent.spec sources
Log Message:
* Thu Mar 08 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.3.4-5jpp.1
- Merge with upstream version, update with the correct src tar ball
Index: concurrent.spec
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/concurrent.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- concurrent.spec 10 Aug 2006 21:12:50 -0000 1.13
+++ concurrent.spec 15 Mar 2007 21:35:13 -0000 1.14
@@ -32,28 +32,26 @@
%define gcj_support
%{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-%define section free
-
Name: concurrent
Version: 1.3.4
-Release: 4jpp.1
+Release: 5jpp.1%{?dist}
Epoch: 0
Summary: Utility classes for concurrent Java programming
-License: Public domain
-Source0:
http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
-Source1: %{name}-%{version}.build.xml
-URL:
http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/
+License: Public Domain
+Source0:
http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz
+Source1: %{name}-%{version}.build.xml
+URL:
http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
Group: Development/Libraries/Java
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if ! %{gcj_support}
BuildArch: noarch
%endif
-BuildRequires: jpackage-utils >= 0:1.5, ant, /bin/bash
+BuildRequires: jpackage-utils >= 0:1.5, ant
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%endif
%description
@@ -92,7 +90,7 @@
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
@@ -111,16 +109,16 @@
rm -f %{_javadocdir}/%{name}
fi
-%post
%if %{gcj_support}
+%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%postun
%if %{gcj_support}
+%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -138,9 +136,12 @@
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
%changelog
+* Thu Mar 08 2007 Permaine Cheung <pcheung at redhat.com> - 0:1.3.4-5jpp.1
+- Merge with upstream version, update with the correct src tar ball
+
* Thu Aug 03 2006 Matt Wringe <mwringe at redhat.com> - 0:1.3.4-4jpp.1
- Merge with upstream version:
- Add missing requires for javadoc task
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/concurrent/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 9 Sep 2004 03:54:29 -0000 1.2
+++ sources 15 Mar 2007 21:35:13 -0000 1.3
@@ -1 +1 @@
-27e9a7b1b2cf307b985bb5bcb9929d44 concurrent.tar.gz
+6a7898a403c3c400f271c6e9285ce9a2 concurrent.tar.gz
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|