[relaxngDatatype] Package cleanup

[Mikolaj Izdebski]

commit e318dc3ebfb97bde50f48dabe77d1c6357e2e84b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Jun 21 16:10:21 2013 +0200

    Package cleanup
    
    - Install license file with javadoc package
    - Convert versioned javadoc to versionless
    - Update to current packaging guidelines
    - Remove msv provides and obsoletes

 relaxngDatatype.spec |   90 +++++++++++++------------------------------------
 1 files changed, 24 insertions(+), 66 deletions(-)
---
diff --git a/relaxngDatatype.spec b/relaxngDatatype.spec
index 98c1b24..d1b39d3 100644
--- a/relaxngDatatype.spec
+++ b/relaxngDatatype.spec
@@ -1,53 +1,17 @@
-# Copyright (c) 2000-2005, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
 Name:           relaxngDatatype
 Version:        1.0
-Release:        10.4%{?dist}
+Release:        10.5%{?dist}
 Summary:        RELAX NG Datatype API
-
-Group:          Development/Libraries/Java
 License:        BSD
 URL:            https://sourceforge.net/projects/relaxng
 # wget http://netcologne.dl.sourceforge.net/project/relaxng/datatype%20%28java%29/Ver.%{version}/%{name}-%{version}.zip
 Source0:        http://netcologne.dl.sourceforge.net/project/relaxng/datatype%20%28java%29/Ver.%{version}/%{name}-%{version}.zip
 Source1:        http://repo1.maven.org/maven2/%{name}/%{name}/20020414/%{name}-20020414.pom
 Patch0:         %{name}-compressjar.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:  ant >= 0:1.6
-Requires:       jpackage-utils
-Provides:       msv <= %{version}
-Obsoletes:      msv <= %{version}
 
 %description
 RELAX NG is a public space for test cases and other ancillary software
@@ -55,56 +19,50 @@ related to the construction of the RELAX NG language and its
 implementations.
 
 %package        javadoc
-Summary:        Javadoc for %{name}
-Group:          Development/Documentation
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
 
 %description    javadoc
-Javadoc for %{name}.
+This package provides %{name}.
 
 %prep
 %setup -q
 %patch0 -p0
+sed -i s/
// copying.txt doc/stylesheet.css
 
 %build
 ant -Dbuild.sysclasspath=only
-sed -i 's/\r//g' copying.txt
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 644 %{name}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-pushd $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-for f in `find -name \*.html -o -name \*.css`; do
-    sed -i 's/\r//g' $f > /dev/null
-done
-popd
-
-# POM and depmap
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -p -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/
+
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%files
-%defattr(-,root,root,-)
+# Workaround for RPM bug (symlink was changed to directory).
+# TODO: Remove this in F-22
+%pretrans javadoc -p <lua>
+dir = "%{_javadocdir}/%{name}"
+dummy = posix.readlink(dir) and os.remove(dir)
+
+%files -f .mfiles
 %doc copying.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}*
+%doc copying.txt
+%doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 21 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0-10.5
+- Install license file with javadoc package
+- Convert versioned javadoc to versionless
+- Update to current packaging guidelines
+- Remove msv provides and obsoletes
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-10.4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild