From 12ed296d927dc80b73ad563203f9b432641e4792 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:14:31 +0000 Subject: import rh-java-common-regexp-1.5-13.15.el7 --- diff --git a/SOURCES/jakarta-regexp-attach-osgi-manifest.patch b/SOURCES/jakarta-regexp-attach-osgi-manifest.patch new file mode 100644 index 0000000..396d6bd --- /dev/null +++ b/SOURCES/jakarta-regexp-attach-osgi-manifest.patch @@ -0,0 +1,10 @@ +--- build.xml~ 2007-03-18 23:41:02.000000000 +0100 ++++ build.xml 2016-01-28 17:57:22.631161037 +0100 +@@ -102,6 +102,7 @@ + + + + diff --git a/SOURCES/jakarta-regexp-osgi-manifest.MF b/SOURCES/jakarta-regexp-osgi-manifest.MF new file mode 100644 index 0000000..e8ebfd0 --- /dev/null +++ b/SOURCES/jakarta-regexp-osgi-manifest.MF @@ -0,0 +1,4 @@ +Bundle-ManifestVersion: 2 +Bundle-SymbolicName: org.apache.regexp +Bundle-Version: 1.5.0 +Export-Package: org.apache.regexp;version="1.5.0" diff --git a/SPECS/regexp.spec b/SPECS/regexp.spec index d0f45df..a93b7e7 100644 --- a/SPECS/regexp.spec +++ b/SPECS/regexp.spec @@ -36,13 +36,15 @@ Name: %{?scl_prefix}%{pkg_name} Version: 1.5 -Release: 13.14%{?dist} +Release: 13.15%{?dist} Epoch: 0 Summary: Simple regular expressions API License: ASL 2.0 Url: http://jakarta.apache.org/%{pkg_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 +Source2: %{full_name}-osgi-manifest.MF +Patch0: %{full_name}-attach-osgi-manifest.patch BuildRequires: %{?scl_prefix}javapackages-tools BuildRequires: %{?scl_prefix}ant >= 1.6 @@ -64,6 +66,8 @@ Javadoc for %{pkg_name}. %prep %setup -q -n %{full_name}-%{version} +%patch0 +cp -p %{SOURCE2} MANIFEST.MF %{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"} set -e -x # remove all binary libs @@ -108,6 +112,9 @@ ant -Djakarta-site2.dir=. test %doc %{_javadocdir}/%{name} %changelog +* Thu Jan 28 2016 Mikolaj Izdebski - 0:1.5-13.15 +- Add OSGi manifest + * Tue Jan 13 2015 Michael Simacek - 0:1.5-13.14 - Mass rebuild 2015-01-13