Attachment 577262 Details for Bug 812215 – Better patch

[patch] Better patch

Drop-qualifier-from-OSGI-manifest--update-version.patch (text/plain), 8.79 KB, created by Krzysztof Daniel on 2012-04-13 08:08:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2012-04-13 08:08:39 UTC

Size: 8.79 KB

patch

obsolete

>diff --git a/.cvsignore b/.cvsignore
>deleted file mode 100644
>index 08d3fb1..0000000
>--- a/.cvsignore
>+++ /dev/null
>@@ -1 +0,0 @@
>-ws-commons-util-1.0.1-src.tar.gz
>diff --git a/.gitignore b/.gitignore
>new file mode 100644
>index 0000000..08d3fb1
>--- /dev/null
>+++ b/.gitignore
>@@ -0,0 +1 @@
>+ws-commons-util-1.0.1-src.tar.gz
>diff --git a/Makefile b/Makefile
>deleted file mode 100644
>index 39fdfcb..0000000
>--- a/Makefile
>+++ /dev/null
>@@ -1,21 +0,0 @@
>-# Makefile for source rpm: ws-common-utils
>-# $Id$
>-NAME := ws-common-utils
>-SPECFILE = $(firstword $(wildcard *.spec))
>-
>-define find-makefile-common
>-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
>-endef
>-
>-MAKEFILE_COMMON := $(shell $(find-makefile-common))
>-
>-ifeq ($(MAKEFILE_COMMON),)
>-# attept a checkout
>-define checkout-makefile-common
>-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
>-endef
>-
>-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
>-endif
>-
>-include $(MAKEFILE_COMMON)
>diff --git a/ws-commons-util-addosgimanifest.patch b/ws-commons-util-addosgimanifest.patch
>index cfcc9c1..9695559 100644
>--- a/ws-commons-util-addosgimanifest.patch
>+++ b/ws-commons-util-addosgimanifest.patch
>@@ -14,8 +14,8 @@
> +			    <Bundle-Name>%Bundle-Name</Bundle-Name>
> +			    <Bundle-Localization>plugin</Bundle-Localization>
> +			    <Bundle-SymbolicName>org.apache.ws.commons.util</Bundle-SymbolicName>
>-+			    <Bundle-Version>1.0.0.qualifier</Bundle-Version>
>-+			    <Export-Package>org.apache.ws.commons.serialize;version="1.0.0", org.apache.ws.commons.util;version="1.0.0"</Export-Package>
>++			    <Bundle-Version>1.0.1</Bundle-Version>
>++			    <Export-Package>org.apache.ws.commons.serialize;version="1.0.1", org.apache.ws.commons.util;version="1.0.1"</Export-Package>
> +			    <Import-Package>javax.xml, javax.xml.namespace, org.w3c.dom, org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers</Import-Package>
> +			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
> +			</manifestEntries>
>diff --git a/ws-commons-util.spec b/ws-commons-util.spec
>index 1e28758..9bf442f 100644
>--- a/ws-commons-util.spec
>+++ b/ws-commons-util.spec
>@@ -1,36 +1,43 @@
> Name:           ws-commons-util
> Version:        1.0.1
>-Release:        2%{?dist}
>-Summary:        Common utilities from the Apache Web Services Project 
>+Release:        21%{?dist}
>+Summary:        Common utilities from the Apache Web Services Project
> 
> Group:          System Environment/Libraries
>-License:        Apache Software License
>+License:        ASL 2.0
> URL:            http://apache.osuosl.org/ws/commons/util/
> Source0:        http://apache.osuosl.org/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
> Patch0:         %{name}-addosgimanifest.patch
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>+BuildArch:      noarch
> 
> BuildRequires:  jpackage-utils >= 1.5
>-BuildRequires:  maven2
>-BuildRequires:  maven2-plugin-jar
>-BuildRequires:  maven2-plugin-compiler
>-BuildRequires:  maven2-plugin-source
>-BuildRequires:  maven2-plugin-assembly
>-BuildRequires:  maven2-plugin-javadoc
>+BuildRequires:  maven
>+BuildRequires:  maven-jar-plugin
>+BuildRequires:  maven-compiler-plugin
>+BuildRequires:  maven-install-plugin
>+BuildRequires:  maven-source-plugin
>+BuildRequires:  maven-assembly-plugin
>+BuildRequires:  maven-javadoc-plugin
>+BuildRequires:  maven-resources-plugin
>+BuildRequires:  maven-surefire-plugin
>+BuildRequires:  maven-surefire-provider-junit
>+BuildRequires:  maven-eclipse-plugin
>+BuildRequires:  maven-doxia
>+BuildRequires:  maven-doxia-sitetools
> BuildRequires:  junit
> BuildRequires:  java-javadoc
> 
>-BuildRequires:    java-gcj-compat-devel >= 1.0.31
>-Requires(post):   java-gcj-compat >= 1.0.31
>-Requires(postun): java-gcj-compat >= 1.0.31
>+Requires(post): jpackage-utils
>+Requires(postun): jpackage-utils
> 
>-%description 
>+%description
> This is version 1.0.1 of the common utilities from the Apache Web
> Services Project.
> 
> %package        javadoc
> Summary:        Javadoc for %{name}
>-Group:          Development/Documentation
>+Group:          Documentation
>+Requires:       jpackage-utils
> 
> %description    javadoc
> %{summary}.
>@@ -40,44 +47,110 @@
> %patch0
> 
> %build
>-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
>-mkdir -p $MAVEN_REPO_LOCAL
>-mvn-jpp \
>-  -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
>-  install javadoc:javadoc
>+mvn-rpmbuild install javadoc:javadoc
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-
> install -dm 755 $RPM_BUILD_ROOT%{_javadir}
>-install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
>-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
>-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+# install maven pom file
>+install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
> 
>-aot-compile-rpm
>+# ... and maven depmap
>+%add_to_maven_depmap org.apache.ws.commons %{name} %{version} JPP %{name}
>+# and alternative depmap used by upstream
>+%add_to_maven_depmap org.apache.ws.commons.util %{name} %{version} JPP %{name}
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
>-%post -p %{_bindir}/rebuild-gcj-db
>+%post
>+%update_maven_depmap
> 
>-%postun -p %{_bindir}/rebuild-gcj-db
>+%postun
>+%update_maven_depmap
>+
>+%pre javadoc
>+# workaround for rpm bug, can be removed in F-17
>+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
>+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
>+
> 
> %files
>-%defattr(644,root,root,755)
> %doc LICENSE.txt
> %{_javadir}/*.jar
>-%{_libdir}/gcj/*
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files javadoc
>-%defattr(644,root,root,755)
>-%doc %{_javadocdir}/%{name}-%{version}
>+%doc LICENSE.txt
> %doc %{_javadocdir}/%{name}
> 
> %changelog
>+* Fri Apr 13 2012 Krzysztof Daniel <kdaniel@redhat.com> 1.0.1-21
>+- Drop qualifier from OSGI manifest.
>+
>+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-20
>+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>+
>+* Thu Jun 16 2011 Andrew Overholt <overholt@redhat.com> 1.0.1-19
>+- Build with Maven 3.
>+- Clean up unnecessary lines.
>+- Remove building with ant.
>+
>+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-18
>+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
>+
>+* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0.1-17
>+- Versionless jars and javadocs
>+- Add jpackage-utils Requires to javadoc subpackage
>+- Add alternative depmap groupId
>+
>+* Fri Sep 10 2010 Alexander Kurtakov <akurtako@redhat.com> 1.0.1-16
>+- Use default file attr.
>+- Use newer maven plugins' names.
>+
>+* Tue Aug 24 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0.1-15
>+- Install maven depmaps and pom.xml files
>+
>+* Wed Jan 13 2010 Andrew Overholt <overholt@redhat.com> 1.0.1-14
>+- Add missing maven-doxia{,-sitetools} BRs.
>+
>+* Wed Jan 13 2010 Andrew Overholt <overholt@redhat.com> 1.0.1-13
>+- Add missing maven-surefire-provider-junit BR.
>+- Remove gcj support
>+- Add ability to build with ant and not maven
>+
>+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-12
>+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
>+
>+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-11
>+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
>+
>+* Fri Sep 12 2008 Andrew Overholt <overholt@redhat.com> 1.0.1-10
>+- Bump so I can chain-build with xmlrpc3.
>+
>+* Fri Sep 12 2008 Andrew Overholt <overholt@redhat.com> 1.0.1-9
>+- Add ppc64.
>+
>+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.0.1-8
>+- fix license tag
>+
>+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.1-7
>+- Autorebuild for GCC 4.3
>+
>+* Thu Sep 13 2007 Andrew Overholt <overholt@redhat.com> 1.0.1-6
>+- Add BR on maven surefire resources, eclipse, and install plugins.
>+
>+* Thu Sep 13 2007 Andrew Overholt <overholt@redhat.com> 1.0.1-5
>+- ExcludeArch ppc64 until maven is built on ppc64.
>+
>+* Thu Sep 13 2007 Andrew Overholt <overholt@redhat.com> 1.0.1-4
>+- Bump again.
>+
>+* Thu Sep 13 2007 Andrew Overholt <overholt@redhat.com> 1.0.1-3
>+- Bump release.
>+
> * Thu Sep 06 2007 Andrew Overholt <overholt@redhat.com> 1.0.1-2
> - maven-ify.
> - Add OSGi MANIFEST information.

Actions: View | Diff

Attachments on bug 812215: 577234 | 577236 | 577262