[pentaho-libxml] ant-nodeps is dropped from ant-1.9.0-2 build in rawhide
paragn
paragn at fedoraproject.org
Tue Aug 6 04:41:53 UTC 2013
commit 3ea84267affdd2964b2bb1fd9ce83cdfd5b55335
Author: Parag Nemade <paragn at fedoraproject.org>
Date: Tue Aug 6 10:11:22 2013 +0530
ant-nodeps is dropped from ant-1.9.0-2 build in rawhide
- Drop buildroot, %clean, %defattr and removal of buildroot in %install
pentaho-libxml.spec | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/pentaho-libxml.spec b/pentaho-libxml.spec
index b6213b1..b323b0a 100644
--- a/pentaho-libxml.spec
+++ b/pentaho-libxml.spec
@@ -2,17 +2,16 @@
Name: pentaho-libxml
Version: 1.1.3
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Namespace aware SAX-Parser utility library
License: LGPLv2
Group: System Environment/Libraries
-#Original source: http://downloads.sourceforge.net/jfreereport/%{origname}-%{version}.zip
+#Original source: http://downloads.sourceforge.net/jfreereport/%%{origname}-%%{version}.zip
#unzip, find . -name "*.jar" -exec rm {} \;
#to simplify the licensing
Source: %{origname}-%{version}-jarsdeleted.zip
URL: http://reporting.pentaho.org/
-BuildRequires: ant, ant-contrib, ant-nodeps, java-devel, jpackage-utils, libbase, libloader
-Buildroot: %{_tmppath}/%{origname}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: ant, ant-contrib, java-devel, jpackage-utils, libbase, libloader
Requires: java, jpackage-utils, libbase >= 1.1.2, libloader >= 1.1.2
BuildArch: noarch
Patch0: libxml-1.1.2-build.patch
@@ -23,7 +22,7 @@ pain of implementing non-trivial SAX input handlers.
%package javadoc
Summary: Javadoc for %{name}
-Group: Development/Documentation
+Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
@@ -47,8 +46,6 @@ for file in README.txt licence-LGPL.txt ChangeLog.txt; do
done
%install
-rm -rf $RPM_BUILD_ROOT
-
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p ./dist/%{origname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
pushd $RPM_BUILD_ROOT%{_javadir}
@@ -58,20 +55,19 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{origname}
cp -rp bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{origname}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(0644,root,root,0755)
%doc licence-LGPL.txt README.txt ChangeLog.txt
%{_javadir}/%{origname}-%{version}.jar
%{_javadir}/%{origname}.jar
%files javadoc
-%defattr(0644,root,root,0755)
%{_javadocdir}/%{origname}
%changelog
+* Tue Aug 06 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.1.3-10
+- ant-nodeps is dropped from ant-1.9.0-2 build in rawhide
+- Drop buildroot, %%clean, %%defattr and removal of buildroot in %%install
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list