commit f57f86bac9c25d0060eb054bf72df216a2e9ecea
Author: Clément DAVID <clement.david(a)scilab-enterprises.com>
Date: Wed Jan 8 12:06:50 2014 +0100
- Fix bug #1001248 about docdir issue
- Allow the user to install javadoc without the main package
- Cleanup the macros definition to allow the use of rpmdev-bumpspec
jogl2.spec | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
---
diff --git a/jogl2.spec b/jogl2.spec
index 78306db..048106b 100644
--- a/jogl2.spec
+++ b/jogl2.spec
@@ -1,23 +1,7 @@
-# baserelease defines which build revision of this version we're building.
-# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
-# you should use.
-%global baserelease 1
-
-%global pkg_name jogl
-%global pkg_version 2.0.2
-#%global pkg_rc rc12
-
-%if 0%{?pkg_rc:0}
-%global pkg_release 0.%{baserelease}.%{pkg_rc}
-%global src_name %{pkg_name}-v%{pkg_version}-%{pkg_rc}
-%else
-%global pkg_release %{baserelease}
-%global src_name %{pkg_name}-v%{pkg_version}
-%endif
-
Name: jogl2
-Version: %{pkg_version}
-Release: %{pkg_release}%{?dist}
+Version: 2.0.2
+Release: 2%{?dist}
+%global src_name jogl-v%{version}
Summary: Java bindings for the OpenGL API
Group: Development/Libraries
@@ -61,9 +45,6 @@ Group: Documentation
Requires: jpackage-utils
BuildArch: noarch
-Requires: jpackage-utils
-Requires: %{name} = %{version}-%{release}
-
%description javadoc
Javadoc for jogl2.
@@ -72,8 +53,6 @@ Summary: User manual for jogl2
Group: Documentation
BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
-
%description doc
User manual for jogl2.
@@ -156,31 +135,38 @@ install -pm 644 %{SOURCE1}
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# Make the javadoc package
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -rdf build/javadoc/jogl/javadoc/* %{buildroot}%{_javadocdir}/%{name}
+cp LICENSE.txt %{buildroot}%{_javadocdir}/%{name}/
# Make the doc package
mkdir -p %{buildroot}%{_docdir}/%{name}
cp -rdf doc/* %{buildroot}%{_docdir}/%{name}
+cp -t %{buildroot}%{_docdir}/%{name}/ README.txt LICENSE.txt CHANGELOG.txt
# update links to javadoc
find %{buildroot}%{_docdir}/%{name} -name '*.html' \
-exec sed -i
"s|/deployment/jogamp-next/javadoc/jogl/javadoc|%{_javadocdir}/%{name}|g" {} +
%files
-%doc README.txt LICENSE.txt CHANGELOG.txt
+%{_docdir}/%{name}/README.txt
+%{_docdir}/%{name}/LICENSE.txt
+%{_docdir}/%{name}/CHANGELOG.txt
%{_libdir}/%{name}
%{_jnidir}/%{name}.jar
%{_mavendepmapfragdir}/%{name}
%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc
-%doc LICENSE.txt
%{_javadocdir}/%{name}
%files doc
-%doc LICENSE.txt
+%{_docdir}/%{name}/LICENSE.txt
%{_docdir}/%{name}
%changelog
+* Wed Jan 08 2014 Clément David <c.david86(a)gmail.com> - 2.0.2-2
+- Fix bug #1001248 about docdir issue
+- Allow the user to install javadoc without the main package
+
* Mon Sep 09 2013 Clément David <c.david86(a)gmail.com> - 2.0.2-1
- Update to the stable 2.0.2 version
Show replies by date