- update to 1.7.3

Changed files:
    jpackage-utils.spec -> 1.33

diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index 71ad45e830457efd3e2b63ac1e9a7c498d39d986..d44722adf7578831b09ea77b9ec2585a26486507 100644 (file)
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -1,67 +1,79 @@
-%define        jpackage_distver 1.6
+# TODO
+# - sync -pl
+%define        jpackage_distver 1.7
 Summary:       JPackage utilities
 Summary(pl.UTF-8):     Narzędzia JPackage
 Name:          jpackage-utils
-Version:       1.6.6
-Release:       16
+Version:       1.7.3
+Release:       0.2
 Epoch:         0
 License:       BSD-like
 Group:         Development/Languages/Java
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 85336e72018ecefa2f9999fc4e6f3eb8
+# Source0-md5: a07616ac64fdcd7f16126227a8b7722c
 Patch0:                %{name}-pdksh.patch
 Patch1:                %{name}-checkdir.patch
 Patch2:                %{name}-errors.patch
 URL:           http://www.jpackage.org/
-BuildRequires: rpmbuild(macros) >= 1.318
+BuildRequires: rpmbuild(macros) >= 1.409
 Requires:      /bin/egrep
 Requires:      /bin/sed
+Conflicts:     rpmbuild(macros) < 1.409
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Utilities from the JPackage Project <http://www.jpackage.org/>:
 
-- %{_bindir}/build-classpath build the Java classpath in a portable
-  manner
-- %{_bindir}/build-jar-repository build a jar repository in a portable
-  manner
-- %{_bindir}/rebuild-jar-repository rebuild a jar repository in a
-  portable manner (after a jvm change...)
-- %{_bindir}/build-classpath-directory build the Java classpath from a
+- build-classpath - build the Java classpath in a portable manner
+- build-jar-repository - build a jar repository in a portable manner
+- rebuild-jar-repository - rebuild a jar repository in a portable
+  manner (after a jvm change...)
+- build-classpath-directory - build the Java classpath from a
   directory
-- %{_bindir}/diff-jars show jar content differences
-- %{_bindir}/jvmjar install jvm extensions
-- %{_datadir}/java-utils/java-functions shell script functions library
-  for Java applications
-- %{_sysconfdir}/java/jpackage-release string identifying the
+- diff-jars - show jar content differences
+- jvmjar - install jvm extensions
+- create-jar-links - create custom jar links
+- clean-binary-files - remove binary files from sources
+- check-binary-files - check for presence of unexpected binary files
+- %{_datadir}/java-utils/java-functions - shell script functions
+  library for Java applications
+- %{_sysconfdir}/java/jpackage-release - string identifying the
   currently installed JPackage release
-- %{_sysconfdir}/java/java.conf system-wide Java configuration file
-- %{_docdir}/%{name}-%{version}/jpackage-policy Java packaging policy
-  for packagers and developers of JPackage Project
+- %{_sysconfdir}/java/java.conf - system-wide Java configuration file
+- %{_docdir}/%{name}-%{version}/jpackage-policy - Java packaging
+  policy for packagers and developers of JPackage Project
+
+It contains also the License, man pages, documentation, XSL files of
+general use with maven2, a header file for spec files etc.
 
 %description -l pl.UTF-8
 Narzędzia z projektu JPackage <http://www.jpackage.org/>:
 
-- %{_bindir}/build-classpath tworzy ścieżkę do klas (classpath) Javy w
+- build-classpath - tworzy ścieżkę do klas (classpath) Javy w
   przenośny sposób
-- %{_bindir}/build-jar-repository tworzy repozytorium jar w przenośny
-  sposób
-- %{_bindir}/rebuild-jar-repository przebudowuje repozytorium jar w
-  przenośny sposób (po zmianie jvm)
-- %{_bindir}/build-classpath-directory tworzy ścieżkę do klas
-  (classpath) Javy z katalogu
-- %{_bindir}/diff-jars pokazuje różnice między zawartością jarów
-- %{_bindir}/jvmjar instaluje rozszerzenia jvm
-- %{_datadir}/java-utils/java-functions to biblioteka funkcji skryptów
-  powłoki dla aplikacji w Javie
+- build-jar-repository - tworzy repozytorium jar w przenośny sposób
+- rebuild-jar-repository - przebudowuje repozytorium jar w przenośny
+  sposób (po zmianie jvm)
+- build-classpath-directory - tworzy ścieżkę do klas (classpath)
+  Javy z katalogu
+- diff-jars - pokazuje różnice między zawartością jarów
+- jvmjar - instaluje rozszerzenia jvm
+- create-jar-links - create custom jar links
+- clean-binary-files - remove binary files from sources
+- check-binary-files - check for presence of unexpected binary files
+- %{_datadir}/java-utils/java-functions to biblioteka funkcji
+  skryptów powłoki dla aplikacji w Javie
 - %{_sysconfdir}/java/jpackage-release to łańcuch określający
   aktualnie zainstalowane wydanie JPackage
-- %{_sysconfdir}/java/java.conf to ogólnosystemowy plik konfiguracyjny
-  Javy
+- %{_sysconfdir}/java/java.conf to ogólnosystemowy plik
+  konfiguracyjny Javy
 - %{_docdir}/%{name}-%{version}/jpackage-policy to polityka
   pakietowania Javy dla osób pakietujących i programistów z projektu
   JPackage
 
+It contains also the License, man pages, documentation, XSL files of
+general use with maven2, a header file for spec files etc.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -81,6 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/java,/etc/env.d,%{_javadocdir},%{_javadir}} \
        $RPM_BUILD_ROOT{%{_jvmsysconfdir},%{_jvmcommondatadir},%{_jvmdatadir},%{_jvmcommonsysconfdir}} \
        $RPM_BUILD_ROOT%{_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0} \
+       $RPM_BUILD_ROOT%{_mavendepmapdir}
 
 # arch dependant
 install -d \
@@ -103,6 +116,10 @@ install -d \
 install -pm 755 bin/* $RPM_BUILD_ROOT%{_bindir}
 install -pm 644 etc/font.properties $RPM_BUILD_ROOT%{_sysconfdir}/java
 
+# Create an initial (empty) depmap
+echo -e "<dependencies>\\n" > ${RPM_BUILD_ROOT}%{_mavendepmapdir}/maven2-depmap.xml
+echo -e "</dependencies>\\n" >> ${RPM_BUILD_ROOT}%{_mavendepmapdir}/maven2-depmap.xml
+
 cat > etc/java.conf << 'EOF'
 # System-wide Java configuration file                                -*- sh -*-
 #
@@ -127,6 +144,10 @@ EOF
 install -pm 644 etc/java.conf $RPM_BUILD_ROOT%{_sysconfdir}/java
 install -pm 644 etc/jpackage-release $RPM_BUILD_ROOT%{_sysconfdir}/java
 install -pm 644 java-utils/* $RPM_BUILD_ROOT%{_javadir}-utils
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_javadir}-utils/xml
+cp -a xml/* $RPM_BUILD_ROOT%{_javadir}-utils/xml
 
 cat << 'EOF' >$RPM_BUILD_ROOT/etc/env.d/JAVA_HOME
 JAVA_HOME=$(. %{_javadir}-utils/java-functions; set_jvm >&2; echo "$JAVA_HOME")
@@ -150,6 +171,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/java.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/java/font.properties
 %config(noreplace,missingok) %verify(not md5 mtime size) /etc/env.d/*
+%{_mandir}/man1/*
+%{_javadir}-utils/*
+%dir %{_mavendepmapdir}
+%config(noreplace) %verify(not md5 mtime size) %{_mavendepmapdir}/maven2-depmap.xml
+%dir %{_javadir}
+%dir %{_javadir}-*
+%docdir %{_javadocdir}
+%dir %{_javadocdir}
 
 # arch dependant
 %dir %{_jvmdir}
@@ -172,8 +201,3 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_jvmsysconfdir}
 %dir %{_jvmcommondatadir}
 %dir %{_jvmcommonsysconfdir}
-%dir %{_javadir}
-%dir %{_javadir}-*
-%docdir %{_javadocdir}
-%dir %{_javadocdir}
-%{_javadir}-utils/*