rpms/vecmath1.2/devel vecmath1.2.spec,1.4,1.5
Jussi Lehtola
jussilehtola at fedoraproject.org
Wed Sep 30 08:51:28 UTC 2009
Author: jussilehtola
Update of /cvs/pkgs/rpms/vecmath1.2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20027
Modified Files:
vecmath1.2.spec
Log Message:
Cleaned up spec file.
Index: vecmath1.2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vecmath1.2/devel/vecmath1.2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- vecmath1.2.spec 27 Jul 2009 06:48:58 -0000 1.4
+++ vecmath1.2.spec 30 Sep 2009 08:51:28 -0000 1.5
@@ -1,13 +1,22 @@
Name: vecmath1.2
Version: 1.14
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Free version of vecmath from the Java3D 1.2 specification
Group: System Environment/Libraries
License: MIT
URL: http://www.objectclub.jp/download/vecmath_e
Source0: http://www.objectclub.jp/download/files/vecmath//%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: java-javadoc java-gcj-compat-devel
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+
+Requires: jpackage-utils
+Requires: java >= 1:1.6.0
+
+# Necessary due to architecture change to noarch
+Obsoletes: %{name} < %{version}-%{release}
%description
This is an unofficial implementation (java source code) of the javax.vecmath
@@ -21,74 +30,57 @@ Generic matrices' LU and SV decompositio
%package javadoc
Group: Development/Libraries
Summary: Javadoc for %{name}
+Requires: %{name} = %{version}-%{release}
+# Necessary due to architecture change to noarch
+Obsoletes: %{name}-javadoc < %{version}-%{release}
%description javadoc
-Javadoc for %{name}.
+This package contains the API documentation for %{name}.
%prep
%setup -q
+find -name *.jar -delete
+find -name *.class -delete
%build
make -f Makefile.unix all docs
pushd classes
-jar cf ../%{name}-%{version}.jar .
+jar cf ../%{name}.jar .
popd
%install
rm -rf $RPM_BUILD_ROOT
-# dirs
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-
# jar
-install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/vecmath.jar
+install -D -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
-cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# gcj
-%{_bindir}/aot-compile-rpm
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+cp -r docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]; then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-
%files
%defattr(-,root,root,-)
%doc README CHANGES
-%{_javadir}/vecmath*
-%{_libdir}/gcj/%{name}
+%{_javadir}/%{name}.jar
%files javadoc
%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
-%ghost %doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}/
%changelog
+* Mon Sep 28 2009 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.14-5
+- Modernized spec file to conform to Java guidelines.
+- Removed clash with vecmath package.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list