rpms/regexp/devel .cvsignore, 1.6, 1.7 regexp.spec, 1.34, 1.35 sources, 1.4, 1.5
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 8 18:08:04 UTC 2007
Author: vivekl
Update of /cvs/dist/rpms/regexp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9174
Modified Files:
.cvsignore regexp.spec sources
Log Message:
- Resync with JPP
- Use the upstream tar ball as JPP does since they clean it off jars anyway
- Use JPackage exception compliant naming scheme
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 5 Aug 2006 00:01:52 -0000 1.6
+++ .cvsignore 8 Feb 2007 18:08:02 -0000 1.7
@@ -1 +1 @@
-jakarta-regexp-1.4-RHCLEAN.tar.gz
+jakarta-regexp-1.4.tar.gz
Index: regexp.spec
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- regexp.spec 5 Aug 2006 00:04:31 -0000 1.34
+++ regexp.spec 8 Feb 2007 18:08:02 -0000 1.35
@@ -32,19 +32,22 @@
%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 full_name jakarta-%{name}
-%define section free
+%define full_name jakarta-%{name}
+%define section free
Name: regexp
Version: 1.4
-Release: 2jpp.2
+Release: 3jpp.1%{dist}
Epoch: 0
Summary: Simple regular expressions API
License: Apache Software License
Group: Development/Libraries/Java
Url: http://jakarta.apache.org/%{name}/
-Source0: jakarta-regexp-%{version}-RHCLEAN.tar.gz
+Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz
BuildRequires: jpackage-utils >= 0:1.6
+Requires(pre): jpackage-utils >= 0:1.6
+Requires(postun): jpackage-utils >= 0:1.6
+
BuildRequires: ant >= 1.6
%if ! %{gcj_support}
Buildarch: noarch
@@ -52,9 +55,9 @@
Buildroot: %{_tmppath}/%{name}-%{version}-buildroot
%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
@@ -76,7 +79,6 @@
Javadoc for %{name}.
%prep
-rm -rf $RPM_BUILD_ROOT
%setup -q -n %{full_name}-%{version}
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
@@ -87,6 +89,8 @@
%install
+rm -rf $RPM_BUILD_ROOT
+
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -142,6 +146,11 @@
%{_javadocdir}/%{name}-%{version}
%changelog
+* Thu Feb 8 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-3jpp.1.fc7
+- Resync with JPP
+- Use the upstream tar ball as JPP does since they clean it off jars anyway
+- Use JPackage exception compliant naming scheme
+
* Fri Aug 4 2006 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-2jpp.2
- Rebuild.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/regexp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 5 Aug 2006 00:01:52 -0000 1.4
+++ sources 8 Feb 2007 18:08:02 -0000 1.5
@@ -1 +1 @@
-3869ec6a6b7ad1c139f2e39219e509ec jakarta-regexp-1.4-RHCLEAN.tar.gz
+d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz
More information about the fedora-cvs-commits
mailing list