Attachment 663564 Details for Bug 655826 – spec file patch

[patch] spec file patch

0001-Fixed-name-of-the-POM-file-resolves-655826.patch (text/plain), 3.86 KB, created by Michal Srb on 2012-12-14 12:53:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Srb

Created: 2012-12-14 12:53:24 UTC

Size: 3.86 KB

patch

obsolete

>From 79150ba63d5f4e1920f018455ee2d0773a45fe11 Mon Sep 17 00:00:00 2001
>From: Michal Srb <msrb@redhat.com>
>Date: Fri, 14 Dec 2012 09:50:26 +0100
>Subject: [PATCH] Fixed name of the POM file (resolves: #655826)
>
>- Moved from add_to_maven_depmap to add_maven_depmap
>- Spec file cleanup
>---
> werken-xpath.spec | 47 ++++++++++++++++++-----------------------------
> 1 file changed, 18 insertions(+), 29 deletions(-)
>
>diff --git a/werken-xpath.spec b/werken-xpath.spec
>index 24e21d4..bf8ac05 100644
>--- a/werken-xpath.spec
>+++ b/werken-xpath.spec
>@@ -32,7 +32,7 @@
> 
> Name:           werken-xpath
> Version:        0.9.4
>-Release:        8.beta.12.4%{?dist}
>+Release:        9.beta.12.4%{?dist}
> Epoch:          0
> Summary:        XPath implementation using JDOM
> # Worth noting that this ASL 1.1 has slightly different wording.
>@@ -57,11 +57,10 @@ BuildRequires:  jdom
> BuildRequires:  xerces-j2
> BuildRequires:  xml-commons-apis
> BuildRequires:  jpackage-utils >= 0:1.6
>-Group:          Development/Libraries/Java
>+Group:          Development/Libraries
> BuildArch:      noarch
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
>-Provides:    werken.xpath = %{epoch}:%{version}-%{release}
>-Obsoletes:   werken.xpath < 0.9.4
>+Provides:       werken.xpath = %{epoch}:%{version}-%{release}
>+Obsoletes:      werken.xpath < 0.9.4
> 
> %description
> werken.xpath is an implementation of the W3C XPath Recommendation, on
>@@ -73,10 +72,10 @@ werken.canonical (XML canonicalization) packages.
> 
> %package        javadoc
> Summary:        Javadoc for %{name}
>-Group:          Development/Documentation
>+Group:          Documentation
> BuildRequires:  java-javadoc
>-Provides:    werken.xpath-javadoc = %{epoch}:%{version}-%{release}
>-Obsoletes:   werken.xpath-javadoc < 0.9.4
>+Provides:       werken.xpath-javadoc = %{epoch}:%{version}-%{release}
>+Obsoletes:      werken.xpath-javadoc < 0.9.4
> 
> %description    javadoc
> Javadoc for %{name}.
>@@ -97,17 +96,11 @@ Javadoc for %{name}.
> 
> # remove all binary libs
> for j in $(find . -name "*.jar"); do
>-	mv $j $j.no
>+         mv $j $j.no
> done
> 
> cp %{SOURCE1} .
> 
>-#pushd lib
>-#ln -sf $(build-classpath antlr) antlr-runtime.jar
>-#ln -sf $(build-classpath jdom) jdom.jar
>-#ln -sf $(build-classpath xerces-j2) xerces.jar
>-#popd
>-
> # -----------------------------------------------------------------------------
> 
> %build
>@@ -121,8 +114,6 @@ sh runtests.sh
> # -----------------------------------------------------------------------------
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-
> # jars
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
> cp -p build/%{dotname}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>@@ -134,32 +125,30 @@ cp -pr build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> # maven
> install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
> install -pm 644 %{name}-%{version}.pom \
>-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}.pom
>-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
>+        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
> 
> 
> # -----------------------------------------------------------------------------
> 
>-%post
>-%update_maven_depmap
>-
>-%postun
>-%update_maven_depmap
>-
> %files
>-%defattr(-,root,root,-)
> %doc INSTALL LICENSE LIMITATIONS README TODO
> %{_javadir}/*
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files javadoc
>-%defattr(-,root,root,-)
>+%doc LICENSE
> %{_javadocdir}/%{name}
> 
> # -----------------------------------------------------------------------------
> 
> %changelog
>+* Wed Dec 12 2012 Michal Srb <msrb@redhat.com> - 0:0.9.4-9.beta.12.4
>+- Fixed name of the POM file (resolves: #655826)
>+- Moved from add_to_maven_depmap to add_maven_depmap
>+- Spec file cleanup
>+
> * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:0.9.4-8.beta.12.4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.8.0.2
>

Actions: View | Diff

Attachments on bug 655826: 663564