- Update to 1.5

- Fix license
- Cosmetic cleanup
This commit is contained in:
Devrim GÜNDÜZ 2008-02-10 03:00:30 +00:00
parent 37d859b093
commit e175c414a5
3 changed files with 41 additions and 36 deletions

View File

@ -1 +1 @@
jakarta-regexp-1.4.tar.gz jakarta-regexp-1.5.tar.gz

View File

@ -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 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 Name: regexp
Version: 1.4 Version: 1.5
Release: 3jpp.1%{dist} Release: 1jpp.1%{dist}
Epoch: 0 Epoch: 0
Summary: Simple regular expressions API Summary: Simple regular expressions API
License: Apache Software License License: ASL 2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://jakarta.apache.org/%{name}/ Url: http://jakarta.apache.org/%{name}/
Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz Source0: http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz
BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: jpackage-utils >= 0:1.6
Requires(pre): jpackage-utils >= 0:1.6 Requires(pre): jpackage-utils >= 0:1.6
Requires(postun): jpackage-utils >= 0:1.6 Requires(postun): jpackage-utils >= 0:1.6
Requires: java Requires: java
BuildRequires: ant >= 1.6 BuildRequires: ant >= 1.6
%if ! %{gcj_support} %if ! %{gcj_support}
Buildarch: noarch Buildarch: noarch
%endif %endif
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{gcj_support} %if %{gcj_support}
BuildRequires: java-gcj-compat-devel BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat Requires(post): java-gcj-compat
Requires(postun): java-gcj-compat Requires(postun): java-gcj-compat
%endif %endif
%description %description
@ -69,11 +69,11 @@ It includes complete Javadoc documentation as well as a simple Applet
for visual debugging and testing suite for compatibility. for visual debugging and testing suite for compatibility.
%package javadoc %package javadoc
Group: Development/Java Group: Development/Java
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
Requires(post): %{__rm} Requires(post): %{__rm}
Requires(postun): %{__rm} Requires(postun): %{__rm}
Requires(post): /bin/ln Requires(post): /bin/ln
%description javadoc %description javadoc
Javadoc for %{name}. Javadoc for %{name}.
@ -89,24 +89,24 @@ ant -Djakarta-site2.dir=. jar javadocs
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
# jars # jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -d -m 755 %{buildroot}%{_javadir}
install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) (cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc # javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} %{__cp} -r docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
rm -rf docs/api %{__rm} -rf docs/api
%if %{gcj_support} %if %{gcj_support}
%{_bindir}/aot-compile-rpm %{_bindir}/aot-compile-rpm
%endif %endif
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%post javadoc %post javadoc
rm -f %{_javadocdir}/%{name} rm -f %{_javadocdir}/%{name}
@ -148,6 +148,11 @@ fi
%ghost %doc %{_javadocdir}/%{name} %ghost %doc %{_javadocdir}/%{name}
%changelog %changelog
* Sat Feb 9 2008 Devrim GUNDUZ <devrim@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 * Thu Feb 8 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-3jpp.1.fc7
- Resync with JPP - Resync with JPP
- Use the upstream tar ball as JPP does since they clean it off jars anyway - Use the upstream tar ball as JPP does since they clean it off jars anyway

View File

@ -1 +1 @@
d903d84c949df848009f3bf205b32c97 jakarta-regexp-1.4.tar.gz b941b8f4de297827f3211c2cb34af199 jakarta-regexp-1.5.tar.gz