[gluegen2] - Fix bug #1001254 about docdir issue

[Clément David]

commit 678c3695b5653872c808e19aab1487a85082dfd8
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Tue Jan 7 17:27:09 2014 +0100

    - Fix bug #1001254 about docdir issue
    
    - Allow the user to install javadoc without the main package

 gluegen2.spec |   36 +++++++++++-------------------------
 1 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/gluegen2.spec b/gluegen2.spec
index dc4364a..13007b8 100644
--- a/gluegen2.spec
+++ b/gluegen2.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 gluegen
-%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:           gluegen2
-Version:        %{pkg_version}
-Release:        %{pkg_release}%{?dist}
+Version:        2.0.2
+Release:        2%{?dist}
+%global src_name gluegen-v%{version}
 Summary:        Java/JNI glue code generator to call out to ANSI C
 
 Group:          Development/Libraries
@@ -72,8 +56,6 @@ Summary:        Javadoc for GlueGen2
 Group:          Documentation
 BuildArch:      noarch
 
-Requires:       jpackage-utils
-
 %description javadoc
 Javadoc for GlueGen2.
 
@@ -192,6 +174,8 @@ cp -rdf build/javadoc/gluegen/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 # Make the doc package
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -rdf doc/manual/* %{buildroot}%{_docdir}/%{name}
+cp LICENSE.txt %{buildroot}%{_docdir}/%{name}/
+cp LICENSE.txt %{buildroot}%{_javadocdir}/%{name}/
 
 %check
 cd make
@@ -214,27 +198,29 @@ _JAVA_OPTIONS="-Djogamp.debug=true -Djava.library.path=../build/test/build/nativ
 EOF
 
 %files
-%doc LICENSE.txt
+%{_docdir}/%{name}/LICENSE.txt
 %{_jnidir}/%{name}-rt.jar
 %{_libdir}/%{name}
 %{_mavendepmapfragdir}/%{name}
 %{_mavenpomdir}/JPP-%{name}-rt.pom
 
 %files devel
-%doc LICENSE.txt
+%{_docdir}/%{name}/LICENSE.txt
 %{_javadir}/%{name}.jar
 %{_mavenpomdir}/JPP-%{name}.pom
 %{gluegen_devel_dir}
 
 %files javadoc
-%doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 %files doc
-%doc LICENSE.txt
 %{_docdir}/%{name}
 
 %changelog
+* Tue Jan 07 2014 Clément David <c.david86 at gmail.com> - 2.0.2-2
+- Fix bug #1001254 about docdir issue
+- Allow the user to install javadoc without the main package
+
 * Mon Sep 09 2013 Clément David <c.david86 at gmail.com> - 2.0.2-1
 - Update to the stable 2.0.2 version