[regexp] Install LICENSE file with javadoc package
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed Oct 31 17:43:17 UTC 2012
commit 0b277f9711a539c7e0136c12eac98af19f38eaf1
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed Oct 31 18:39:18 2012 +0100
Install LICENSE file with javadoc package
- Add maven POM file
- Update to current packaging guidelines
- Convert versioned JAR to unversioned
regexp.spec | 67 ++++++++++++++++++++++++++++++----------------------------
sources | 1 +
2 files changed, 36 insertions(+), 32 deletions(-)
---
diff --git a/regexp.spec b/regexp.spec
index e46049f..faee00b 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -28,25 +28,23 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%global full_name jakarta-%{name}
-
-Name: regexp
-Version: 1.5
-Release: 8%{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
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%global full_name jakarta-%{name}
+
+Name: regexp
+Version: 1.5
+Release: 9%{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
+Source1: http://repo.maven.apache.org/maven2/%{full_name}/%{full_name}/1.4/%{full_name}-1.4.pom
+BuildRequires: jpackage-utils >= 0:1.6
+Requires: java
+
+BuildRequires: ant >= 1.6
+BuildArch: noarch
%description
Regexp is a 100% Pure Java Regular Expression package that was
@@ -57,8 +55,8 @@ It includes complete Javadoc documentation as well as a simple Applet
for visual debugging and testing suite for compatibility.
%package javadoc
-Group: Development/Java
-Summary: Javadoc for %{name}
+Group: Development/Java
+Summary: Javadoc for %{name}
%description javadoc
Javadoc for %{name}.
@@ -74,32 +72,37 @@ ant -Djakarta-site2.dir=. jar javadocs
%install
-rm -rf %{buildroot}
-
# jars
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)
+install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}.jar
+
# javadoc
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
+cp -r docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%clean
-rm -rf %{buildroot}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap -a regexp:regexp
%files
-%defattr(-,root,root,-)
%doc LICENSE
-%{_javadir}/*.jar
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
%files javadoc
-%defattr(-,root,root,-)
+%doc LICENSE
%{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name}
%changelog
+* Wed Oct 31 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.5-9
+- Install LICENSE file with javadoc package
+- Add maven POM file
+- Update to current packaging guidelines
+- Convert versioned JAR to unversioned
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 2586585..3b8e7e6 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
b941b8f4de297827f3211c2cb34af199 jakarta-regexp-1.5.tar.gz
+d7d0510793c9081445fad8903a423f90 jakarta-regexp-1.4.pom
More information about the scm-commits
mailing list