rpms/regexp/devel .cvsignore, 1.7, 1.8 regexp.spec, 1.37, 1.38 sources, 1.5, 1.6
Devrim GÜNDÜZ (devrim)
fedora-extras-commits at redhat.com
Sun Feb 10 03:01:05 UTC 2008
Author: devrim
Update of /cvs/extras/rpms/regexp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8873
Modified Files:
.cvsignore regexp.spec sources
Log Message:
- Update to 1.5
- Fix license
- Cosmetic cleanup
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/regexp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 8 Feb 2007 18:08:02 -0000 1.7
+++ .cvsignore 10 Feb 2008 03:00:30 -0000 1.8
@@ -1 +1 @@
-jakarta-regexp-1.4.tar.gz
+jakarta-regexp-1.5.tar.gz
Index: regexp.spec
===================================================================
RCS file: /cvs/extras/rpms/regexp/devel/regexp.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- regexp.spec 9 Feb 2007 17:43:14 -0000 1.37
+++ regexp.spec 10 Feb 2008 03:00:30 -0000 1.38
@@ -32,32 +32,32 @@
%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 full_name jakarta-%{name}
-Name: regexp
-Version: 1.4
-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: 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
-Requires: java
+Name: regexp
+Version: 1.5
+Release: 1jpp.1%{dist}
+Epoch: 0
+Summary: Simple regular expressions API
+License: ASL 2.0
+Group: Development/Libraries/Java
+Url: http://jakarta.apache.org/%{name}/
+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
+Requires: java
-BuildRequires: ant >= 1.6
+BuildRequires: ant >= 1.6
%if ! %{gcj_support}
-Buildarch: noarch
+Buildarch: noarch
%endif
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%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
@@ -69,11 +69,11 @@
for visual debugging and testing suite for compatibility.
%package javadoc
-Group: Development/Java
-Summary: Javadoc for %{name}
-Requires(post): %{__rm}
-Requires(postun): %{__rm}
-Requires(post): /bin/ln
+Group: Development/Java
+Summary: Javadoc for %{name}
+Requires(post): %{__rm}
+Requires(postun): %{__rm}
+Requires(post): /bin/ln
%description javadoc
Javadoc for %{name}.
@@ -89,24 +89,24 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -rf docs/api
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%{__cp} -r docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf docs/api
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post javadoc
rm -f %{_javadocdir}/%{name}
@@ -148,6 +148,11 @@
%ghost %doc %{_javadocdir}/%{name}
%changelog
+* Sat Feb 9 2008 Devrim GUNDUZ <devrim at commandprompt.com> 0:1.5-1jpp.1
+- Update to 1.5
+- Fix license
+- Cosmetic cleanup
+
* 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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/regexp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Feb 2007 18:08:02 -0000 1.5
+++ sources 10 Feb 2008 03:00:30 -0000 1.6
@@ -1 +1 @@
-d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz
+b941b8f4de297827f3211c2cb34af199 jakarta-regexp-1.5.tar.gz
More information about the fedora-extras-commits
mailing list