Attachment 846543 Details for Bug 1022172 – Adapt to current packaging guidelines

[patch] Adapt to current packaging guidelines

0001-Adapt-to-current-packaging-guidelines-rhbz-1022172.patch (text/plain), 2.27 KB, created by Michael Simacek on 2014-01-07 09:48:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-01-07 09:48:47 UTC

Size: 2.27 KB

patch

obsolete

>From d2b80d736322834d9e1b4627e0f550ef95a51822 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 7 Jan 2014 10:47:42 +0100
>Subject: [PATCH] Adapt to current packaging guidelines (rhbz#1022172)
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> xjparse.sh   |  8 --------
> xjparse.spec | 19 ++++++-------------
> 2 files changed, 6 insertions(+), 21 deletions(-)
> delete mode 100644 xjparse.sh
>
>diff --git a/xjparse.sh b/xjparse.sh
>deleted file mode 100644
>index 6bb0f54..0000000
>--- a/xjparse.sh
>+++ /dev/null
>@@ -1,8 +0,0 @@
>-#!/bin/bash
>-. /usr/share/java-utils/java-functions
>-
>-MAIN_CLASS=com.nwalsh.parsers.xjparse
>-
>-set_classpath "xjparse xml-commons-resolver"
>-
>-run "$@"
>diff --git a/xjparse.spec b/xjparse.spec
>index 7a66d09..bd854f6 100644
>--- a/xjparse.spec
>+++ b/xjparse.spec
>@@ -1,13 +1,10 @@
> Name:		xjparse
> Version:	1.0
>-Release:	10%{?dist}
>+Release:	11%{?dist}
> Summary:	Wrapper for the Xerces XML Schema validator
>-Group:		Applications/Text
> License:	ASL 2.0
> URL:		http://nwalsh.com/java/xjparse
> Source0:	http://nwalsh.com/java/xjparse/xjparse-src-%{version}.zip
>-Source1:	xjparse.sh
>-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildArch:	noarch
> BuildRequires:	java-devel
> BuildRequires:	jpackage-utils
>@@ -32,26 +29,22 @@ export CLASSPATH=$(build-classpath xml-commons-resolver)
> ant -f build.xml jar -verbose
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-
> mkdir -p $RPM_BUILD_ROOT%{_javadir}
> cp -p build/xjparse.jar \
>-$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
>-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>+$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
> 
> install -dm 755 $RPM_BUILD_ROOT%{_bindir}
>-install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xjparse
> 
>-%clean
>-rm -rf $RPM_BUILD_ROOT
>+%jpackage_script com.nwalsh.parsers.xjparse "" "" xjparse:xml-commons-resolver xjparse true
> 
> %files
>-%defattr(-,root,root,-)
>-%{_javadir}/%{name}-%{version}.jar
> %{_javadir}/%{name}.jar
> %{_bindir}/xjparse
> 
> %changelog
>+* Tue Jan 07 2014 Michael Simacek <msimacek@redhat.com> - 1.0-11
>+- Adapt to current packaging guidelines (rhbz#1022172)
>+
> * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-10
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1022172: 846543