Update to latest packaging guidelines

- Cleanup BuildRequires
This commit is contained in:
Stanislav Ochotnicky 2013-06-12 16:40:15 +02:00
parent f6af6a4162
commit 0255ffa8c3
1 changed files with 23 additions and 29 deletions

View File

@ -30,29 +30,27 @@
Name: xmlunit Name: xmlunit
Version: 1.4 Version: 1.4
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 0 Epoch: 0
Summary: Provides classes to do asserts on xml Summary: Provides classes to do asserts on xml
License: BSD License: BSD
Source0: http://downloads.sourceforge.net/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%201.4/xmlunit-1.4-src.zip Source0: http://downloads.sourceforge.net/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%201.4/xmlunit-1.4-src.zip
Source1: http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom Source1: http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom
URL: http://xmlunit.sourceforge.net/ URL: http://xmlunit.sourceforge.net/
BuildRequires: jpackage-utils >= 0:1.7.3 BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0 BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant >= 0:1.6.5 BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: ant-trax BuildRequires: junit
BuildRequires: junit >= 0:3.8.1
BuildRequires: xalan-j2 BuildRequires: xalan-j2
BuildRequires: xerces-j2 BuildRequires: xerces-j2
BuildRequires: xml-commons-apis BuildRequires: xml-commons-apis
BuildRequires: dblatex
BuildRequires: docbook5-style-xsl Requires: junit
Requires: junit >= 0:3.8
Requires: xalan-j2 Requires: xalan-j2
Requires: xml-commons-apis Requires: xml-commons-apis
Requires: jpackage-utils Requires: jpackage-utils
Group: Development/Tools
BuildArch: noarch BuildArch: noarch
%description %description
@ -63,8 +61,6 @@ expressions.
%package javadoc %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
Group: Documentation
Requires: jpackage-utils
%description javadoc %description javadoc
Javadoc for %{name} Javadoc for %{name}
@ -93,43 +89,41 @@ export CLASSPATH=$(build-classpath xalan-j2-serializer)
ant -Dbuild.compiler=modern -Dfailonerror=false jar javadocs ant -Dbuild.compiler=modern -Dfailonerror=false jar javadocs
%install %install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir} mkdir -p $RPM_BUILD_ROOT%{_javadir}
install -m 0644 build/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar install -m 0644 build/lib/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
# poms # poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -m 644 %{SOURCE1} \ install -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# Javadoc # Javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr build/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%post %pretrans javadoc -p <lua>
%update_maven_depmap -- we changed symlink to dir in 1.4-2, workaround RPM issues
path = '%{_javadocdir}/%{name}'
if posix.readlink(path) then
os.remove(path)
end
%postun
%update_maven_depmap
%files %files -f .mfiles
%defattr(-,root,root,-)
%{_javadir}/*
%doc README.txt LICENSE.txt userguide/XMLUnit-Java.pdf %doc README.txt LICENSE.txt userguide/XMLUnit-Java.pdf
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%files javadoc %files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%doc %{_javadocdir}/%{name} %doc %{_javadocdir}/%{name}
%changelog %changelog
* Wed Jun 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-2
- Update to latest packaging guidelines
- Cleanup BuildRequires
* Fri Feb 15 2013 Dr. Tilmann Bubeck <t.bubeck@reinform.de> - 0:1.4-1 * Fri Feb 15 2013 Dr. Tilmann Bubeck <t.bubeck@reinform.de> - 0:1.4-1
- update to upstream's xmlunit-1.4 - update to upstream's xmlunit-1.4