[isorelax] Update to current guidelines.
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Apr 6 13:19:45 UTC 2012
commit b262533f4c89d882abbef975e47f930384e8e665
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Fri Apr 6 16:19:29 2012 +0300
Update to current guidelines.
Remove unneeded BR/R.
isorelax.spec | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
---
diff --git a/isorelax.spec b/isorelax.spec
index 7c0f390..b18c8de 100644
--- a/isorelax.spec
+++ b/isorelax.spec
@@ -28,15 +28,15 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define cvstag release-20050331
+%global cvstag release-20050331
Name: isorelax
Summary: Public interfaces for RELAX Core
-Url: http://iso-relax.sourceforge.net/
+URL: http://iso-relax.sourceforge.net/
Epoch: 1
Version: 0
# I can't use %%{cvstag} as dashes aren't allowed in Release tags
-Release: 0.6.release20050331%{?dist}
+Release: 0.7.release20050331%{?dist}
License: MIT
Group: Development/Libraries/Java
BuildArch: noarch
@@ -55,11 +55,8 @@ Patch0: %{name}-apidocsandcompressedjar.patch
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant
-BuildRequires: xerces-j2
-BuildRequires: xml-commons-apis
-Requires: xerces-j2
-Requires: xml-commons-apis
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: java
+Requires: jpackage-utils
%description
The ISO RELAX project was started to host public interfaces
@@ -69,6 +66,7 @@ some of the hosted material is schema language-neutral.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -80,40 +78,28 @@ ln -s %{_javadir}/ant.jar lib/
%patch0 -p0
%build
-export CLASSPATH=$(build-classpath \
-xerces-j2 \
-xml-commons-apis \
-)
ant release
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && \
- for jar in *-%{version}*; do \
- ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; \
- done
-)
+install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
-%defattr(-,root,root)
%{_javadir}/*
%files javadoc
-%defattr(-,root,root)
%doc %{_javadocdir}/*
%changelog
+* Fri Apr 6 2012 Alexander Kurtakov <akurtako at redhat.com> 1:0-0.7.release20050331
+- Update to current guidelines.
+- Drop all fake BR/R now.
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0-0.6.release20050331
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list