Update to 1.5, rhbz #895934

- Drop unneeded patch
This commit is contained in:
Mat Booth 2013-03-19 17:33:44 +00:00
parent b5fc31e3f3
commit d49a5ce820
4 changed files with 16 additions and 1071 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
xmlgraphics-commons-1.3-src.tar.gz
xmlgraphics-commons-1.3.1-src.tar.gz
/xmlgraphics-commons-1.5-src.tar.gz

View File

@ -1 +1 @@
d2b56a1671d2ca63480e38acd9629ea7 xmlgraphics-commons-1.4-src.tar.gz
e7012400a3c9d10a18bc5c3515610f35 xmlgraphics-commons-1.5-src.tar.gz

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
Name: xmlgraphics-commons
Version: 1.4
Release: 7%{?dist}
Version: 1.5
Release: 1%{?dist}
Epoch: 0
Summary: XML Graphics Commons
@ -8,20 +8,19 @@ Group: Development/Libraries
License: ASL 2.0
URL: http://xmlgraphics.apache.org/
Source0: http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{version}-src.tar.gz
Patch0: %{name}-java-7-fix.patch
BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: jpackage-utils
BuildRequires: ant >= 0:1.6
BuildRequires: ant-junit >= 0:1.6
BuildRequires: junit
BuildRequires: apache-commons-io >= 0:1.1
BuildRequires: apache-commons-logging >= 0:1.0.4
Requires: apache-commons-logging >= 0:1.0.4
Requires: apache-commons-io >= 0:1.1
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
BuildRequires: apache-commons-io >= 1.3.1
BuildRequires: apache-commons-logging >= 1.0.4
Requires: java
Requires: jpackage-utils
Requires: apache-commons-io >= 1.3.1
Requires: apache-commons-logging >= 1.0.4
%description
Apache XML Graphics Commons is a library that consists of
@ -44,7 +43,6 @@ Requires: jpackage-utils
%prep
%setup -q %{name}-%{version}
rm -f `find . -name "*.jar"`
%patch0
# create pom from template
sed "s:@version@:%{version}:g" %{name}-pom-template.pom \
@ -63,17 +61,11 @@ ant package javadocs
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -Dpm 0644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -pm 644 %{name}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.xmlgraphics %{name} %{version} JPP %{name}
%add_maven_depmap JPP-%{name}.pom %{name}.jar
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%post
%update_maven_depmap
%postun
%update_maven_depmap
%files
%doc LICENSE NOTICE README
%{_mavendepmapfragdir}/%{name}
@ -86,6 +78,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
* Tue Mar 19 2013 Mat Booth <fedora@matbooth.co.uk> - 0:1.5-1
- Update to 1.5, rhbz #895934
- Drop unneeded patch
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild