diff --git a/qdox-MANIFEST.MF b/qdox-MANIFEST.MF new file mode 100644 index 0000000..0ef2446 --- /dev/null +++ b/qdox-MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-Vendor: %providerName +Bundle-Localization: plugin +Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Bundle-Name: %pluginName +Bundle-SymbolicName: com.thoughtworks.qdox +Bundle-Version: 1.6.3.v20081201-1400 +Export-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks + .qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi + on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor + ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio + n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor + ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru + cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3" +Bundle-ManifestVersion: 2 +Import-Package: junit.framework;version="[3.8.2,4.0.0)";resolution:=op + tional,org.apache.tools.ant;version="[1.7.0,2.0.0)";resolution:=optio + nal,org.apache.tools.ant.types;version="[1.7.0,2.0.0)";resolution:=op + tional diff --git a/qdox.spec b/qdox.spec index 291cc8a..dae1b0e 100644 --- a/qdox.spec +++ b/qdox.spec @@ -31,12 +31,13 @@ Summary: Extract class/interface/method definitions from sources Name: qdox Version: 1.12 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 License: ASL 2.0 URL: http://qdox.codehaus.org/ Group: Development/Libraries Source0: http://repo2.maven.org/maven2/com/thoughtworks/qdox/qdox/%{version}/%{name}-%{version}-project.tar.bz2 +Source1: qdox-MANIFEST.MF Patch0: %{name}-disable-xsite.patch BuildRequires: jpackage-utils >= 0:1.7.4 @@ -67,8 +68,6 @@ BuildRequires: maven-jflex-plugin BuildRequires: maven-release-plugin Requires: java >= 1:1.6.0 -Requires(post): jpackage-utils >= 0:1.7.4 -Requires(postun): jpackage-utils >= 0:1.7.4 BuildArch: noarch Obsoletes: qdox-manual <= 0:1.9.2 @@ -107,30 +106,27 @@ mvn-rpmbuild \ -Dmaven.test.skip=true \ ant:ant install javadoc:javadoc +# inject OSGi manifests +mkdir -p META-INF +cp -p %{SOURCE1} META-INF/MANIFEST.MF +touch META-INF/MANIFEST.MF +zip -u target/%{name}-%{version}.jar META-INF/MANIFEST.MF + %install # jars mkdir -p $RPM_BUILD_ROOT%{_javadir} cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -%add_to_maven_depmap %{name} %{name} %{version} JPP %{name} -%add_to_maven_depmap com.thoughtworks.qdox qdox %{version} JPP %{name} - - # poms install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -install -m 644 pom.xml \ - $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom + +%add_maven_depmap -a qdox:qdox # javadoc mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %doc LICENSE.txt README.txt %{_javadir}/%{name}.jar @@ -141,6 +137,9 @@ cp -pr target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %doc %{_javadocdir}/%{name} %changelog +* Wed Aug 1 2012 Alexander Kurtakov 0:1.12-6 +- Inject osgi metadata from eclipse orbit. + * Sat Jul 21 2012 Fedora Release Engineering - 0:1.12-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild