From 23e2b6af7216e8f3ff7c0d4b6de29c8d9d5cab84719cf970700ee1decdc01992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 11 Jul 2014 13:59:47 +0000 Subject: [PATCH] - Cleanup with spec-cleaner and do not version javadoc dir. OBS-URL: https://build.opensuse.org/package/show/Java:packages/xpp2?expand=0&rev=9 --- xpp2.changes | 5 +++ xpp2.spec | 98 ++++++++++++++-------------------------------------- 2 files changed, 31 insertions(+), 72 deletions(-) diff --git a/xpp2.changes b/xpp2.changes index e63fb11..ccc76fe 100644 --- a/xpp2.changes +++ b/xpp2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 11 13:59:37 UTC 2014 - tchvatal@suse.com + +- Cleanup with spec-cleaner and do not version javadoc dir. + ------------------------------------------------------------------- Mon Sep 9 11:06:31 UTC 2013 - tchvatal@suse.com diff --git a/xpp2.spec b/xpp2.spec index 7d51b17..842e991 100644 --- a/xpp2.spec +++ b/xpp2.spec @@ -1,7 +1,7 @@ # # spec file for package xpp2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,15 +16,13 @@ # -%define section free %define originalname PullParser -Summary: XML Pull Parser -License: Apache-1.1 -Group: Development/Libraries/Java - Name: xpp2 Version: 2.1.10 Release: 0 +Summary: XML Pull Parser +License: Apache-1.1 +Group: Development/Libraries/Java Url: http://www.extreme.indiana.edu/xgws/xsoap/xpp/ Source0: http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/PullParser2.1.10.tar.bz2 Patch0: xpp2-build_xml.patch @@ -35,16 +33,14 @@ BuildRequires: javapackages-tools BuildRequires: junit BuildRequires: xml-commons-apis Requires: xml-commons-apis -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser. NOTE: XPP2 is no longer developed and is on maintenance mode. All active development concentrates on its successor XPP3/MXP1 - - %package javadoc Summary: XML Pull Parser Group: Development/Libraries/Java @@ -54,8 +50,6 @@ XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser. NOTE: XPP2 is no longer developed and is on maintenance mode. All active development concentrates on its successor XPP3/MXP1 - - %package manual Summary: XML Pull Parser Group: Development/Libraries/Java @@ -65,8 +59,6 @@ XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser. NOTE: XPP2 is no longer developed and is on maintenance mode. All active development concentrates on its successor XPP3/MXP1 - - %package demo Summary: XML Pull Parser Group: Development/Libraries/Java @@ -77,8 +69,6 @@ XML Pull Parser 2 (XPP2) is a simple and fast incremental XML parser. NOTE: XPP2 is no longer developed and is on maintenance mode. All active development concentrates on its successor XPP3/MXP1 - - %prep %setup -q -n %{originalname}%{version} # remove all binary libs @@ -94,69 +84,36 @@ java AllTests %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}%{_javadir} cp -p build/lib/%{originalname}-intf-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-intf-%{version}.jar + %{buildroot}%{_javadir}/%{name}-intf-%{version}.jar cp -p build/lib/%{originalname}-standard-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-standard-%{version}.jar + %{buildroot}%{_javadir}/%{name}-standard-%{version}.jar cp -p build/lib/%{originalname}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar + %{buildroot}%{_javadir}/%{name}-%{version}.jar cp -p build/lib/%{originalname}-x2-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-x2-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) + %{buildroot}%{_javadir}/%{name}-x2-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl -cp -pr doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api -cp -pr doc/api_impl/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api_impl -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name}/api +mkdir -p %{buildroot}%{_javadocdir}/%{name}/api_impl +cp -pr doc/api/* %{buildroot}%{_javadocdir}/%{name}/api +cp -pr doc/api_impl/* %{buildroot}%{_javadocdir}/%{name}/api_impl rm -rf doc/{build.txt,api,api_impl} # manual -mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} -cp -pr doc/* $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} -cp -p README.html $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} -cp -p LICENSE.txt $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name} +mkdir -p %{buildroot}%{_datadir}/doc/%{name} +cp -pr doc/* %{buildroot}%{_datadir}/doc/%{name} +cp -p README.html %{buildroot}%{_datadir}/doc/%{name} +cp -p LICENSE.txt %{buildroot}%{_datadir}/doc/%{name} # demo -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} -%fdupes -s %{buildroot}/%{_javadocdir}/%{name}-%{version} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - -%post manual -rm -f %{_datadir}/doc/%{name} -ln -s %{name}-%{version} %{_datadir}/doc/%{name} - -%postun manual -if [ "$1" = "0" ]; then - rm -f %{_datadir}/doc/%{name} -fi - -%post demo -rm -f %{_datadir}/%{name} -ln -s %{name}-%{version} %{_datadir}/%{name} - -%postun demo -if [ "$1" = "0" ]; then - rm -f %{_datadir}/%{name} -fi +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -pr src/java/samples/* %{buildroot}%{_datadir}/%{name} +%fdupes -s %{buildroot}/%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) -%{_datadir}/doc/%{name}-%{version}/README.html -%{_datadir}/doc/%{name}-%{version}/LICENSE.txt +%{_datadir}/doc/%{name}/README.html +%{_datadir}/doc/%{name}/LICENSE.txt %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-intf.jar @@ -168,19 +125,16 @@ fi %files javadoc %defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files manual %defattr(0644,root,root,0755) -%{_datadir}/doc/%{name}-%{version} %{_datadir}/doc/%{name} -%exclude %{_datadir}/doc/%{name}-%{version}/README.html -%exclude %{_datadir}/doc/%{name}-%{version}/LICENSE.txt +%exclude %{_datadir}/doc/%{name}/README.html +%exclude %{_datadir}/doc/%{name}/LICENSE.txt %files demo %defattr(0644,root,root,0755) -%{_datadir}/%{name}-%{version} %{_datadir}/%{name} %changelog