rpms/jpackage-utils/devel .cvsignore, 1.8, 1.9 jpackage-utils.spec, 1.32, 1.33 sources, 1.8, 1.9

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Dec 11 20:09:46 UTC 2006 

Author: fitzsim

Update of /cvs/dist/rpms/jpackage-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22752

Modified Files:
	.cvsignore jpackage-utils.spec sources 
Log Message:
* Mon Dec 11 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.7.3-1jpp.1.fc7
- Import version 0:1.7.3-1jpp from jpackage.org.
- Change release numbering format to Xjpp.Y.fc7.
- Resolves: rhbz#218936




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Jul 2006 08:39:20 -0000	1.8
+++ .cvsignore	11 Dec 2006 20:09:44 -0000	1.9
@@ -1,2 +1,2 @@
-jpackage-utils-1.6.6.tar.bz2
+jpackage-utils-1.7.3.tar.bz2
 jpackage-utils-enable-gcj-support.patch


Index: jpackage-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- jpackage-utils.spec	1 Sep 2006 20:00:43 -0000	1.32
+++ jpackage-utils.spec	11 Dec 2006 20:09:44 -0000	1.33
@@ -1,11 +1,40 @@
+# Copyright (c) 2000-2006, 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.
+#
 %define gcj_support 1
 
-%define distver 1.6
+%define distver 1.7
 %define section free
 
 Name:           jpackage-utils
-Version:        1.6.6
-Release:        1jpp.8
+Version:        1.7.3
+Release:        1jpp.1%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        JPackage License
@@ -39,6 +68,12 @@
                                 show jar content differences
 * %{_bindir}/jvmjar
                                 install jvm extensions
+* %{_bindir}/create-jar-links
+                                create custom jar links
+* %{_bindir}/clean-binary-files
+                                remove binary files from sources
+* %{_bindir}/check-binary-files
+                                check for presence of unexpected binary files
 * %{_datadir}/java-utils/java-functions
                                 shell script functions library for Java
                                 applications
@@ -53,6 +88,9 @@
                                 Java packaging policy for packagers and
                                 developers
 
+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
@@ -72,7 +110,7 @@
     jvmdir jvmjardir jvmprivdir \
     jvmlibdir jvmdatadir jvmsysconfdir \
     jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
-    javadir jnidir javadocdir ; do
+    javadir jnidir javadocdir mavendepmapdir; do
   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" misc/macros.jpackage | %{__awk} '{ print $2 }'))
 done
 
@@ -96,6 +134,7 @@
 install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{utils,ext,1.3.1,1.4.0,1.4.1,1.4.2,1.5.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{ext,1.3.1,1.4.0,1.4.1,1.4.2,1.5.0}
 install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
+install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapdir}
 
 %if %{gcj_support}
 cat > bin/rebuild-security-providers << EOF
@@ -123,6 +162,10 @@
 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 -*-
 #
@@ -148,9 +191,14 @@
 install -pm 644 etc/jpackage-release ${RPM_BUILD_ROOT}%{_sysconfdir}/java
 install -pm 644 java-utils/* ${RPM_BUILD_ROOT}${_javadir}-utils
 install -pm 644 misc/macros.jpackage ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1
+install -pm 644 man/* ${RPM_BUILD_ROOT}%{_mandir}/man1
+%{__mkdir_p} ${RPM_BUILD_ROOT}${_javadir}-utils/xml
+install -pm 644 xml/* ${RPM_BUILD_ROOT}${_javadir}-utils/xml
 
 cat <<EOF > %{name}-%{version}.files
 %{_bindir}/*
+%{_mandir}/man1/*
 %dir %{_sysconfdir}/java
 %dir ${_jvmdir}
 %dir ${_jvmjardir}
@@ -166,11 +214,13 @@
 %dir ${_jnidir}
 %dir ${_jnidir}-*
 %dir ${_javadocdir}
+%dir ${_mavendepmapdir}
 ${_javadir}-utils/*
 %config %{_sysconfdir}/java/jpackage-release
 %config(noreplace) %{_sysconfdir}/java/java.conf
 %config(noreplace) %{_sysconfdir}/java/font.properties
 %config(noreplace) %{_sysconfdir}/rpm/macros.jpackage
+%config(noreplace) ${_mavendepmapdir}/maven2-depmap.xml
 EOF
 
 
@@ -201,7 +251,7 @@
 
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
-%doc LICENSE.txt doc/* etc/httpd-javadoc.conf
+%doc LICENSE.txt HEADER.JPP doc/* etc/httpd-javadoc.conf
 %if %{gcj_support}
 %{_sysconfdir}/java/security
 %{_sysconfdir}/java/security/security.d
@@ -209,37 +259,25 @@
 
 
 %changelog
-* Fri Sep  1 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp.8
-- Make rebuild-security-providers rebuild
-  /usr/lib/security/classpath.security and
-  /usr/lib64/security/classpath.security. (204660)
-
-* Wed Aug 30 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp.7
-- Make rebuild-security-providers look in %{_libdir}.
-
-* Wed Aug 23 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.6.6-1jpp.6
-- Rebuild
-
-* Sat Jul 22 2006 Jakub Jelinek <jakub at redhat.com> - 0:1.6.6-1jpp_5rh
-- Rebuilt
-
-* Fri Jul 21 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_4rh
-- Enable GCJ support in macros.jpackage.
-
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.6.6-1jpp_3rh
-- rebuild
-
-* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_2rh
-- Add /usr/share/java-1.3.1 and /usr/lib/java-1.3.1
-  directories. (160327)
-
-* Mon Feb  6 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.6.6-1jpp_1rh
-- Import jpackage-utils 0:1.6.6-1jpp from jpackage.org.
-- Add rebuild-security-providers script.
-- Install security directory in /etc.
-- Do not provide java-javadoc.
-- Do not install a dummy package-list file.
-- Do not take ownership of %{_javadocdir}/java.
+* Mon Dec 11 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.7.3-1jpp.1.fc7
+- Import version 0:1.7.3-1jpp from jpackage.org.
+- Change release numbering format to Xjpp.Y.fc7.
+- Resolves: rhbz#218936
+
+* Sat Nov 11 2006 Ville Skyttä <scop at jpackage.org> - 0:1.7.3-1jpp
+- Add Java 1.6.0 dirs.
+
+* Mon Oct 23 2006 Deepak Bhole <dbhole at redhat.com> 1.7.2-1jpp
+- Added maven2 depmap related macros.
+
+* Tue Sep 19 2006 Fernando Nasser <fnasser at jpackage.org> 0:1.7.1-1jpp
+- Add new scripts from Deepak Bhole
+- Add documentation from Jason Corley
+- Add XLT file shared by maven2 packages
+
+* Fri Nov 04 2005 Fernando Nasser <fnasser at jpackage.org> 0:1.7.0-1jpp
+- Initial 1.7 release (eq. to 1.6.6)
+- Add Copyright notice and license as header
 
 * Sun Sep 18 2005 David Walluck <david at jpackage.org> 0:1.6.6-1jpp
 - always define macros


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/jpackage-utils/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Jul 2006 08:39:20 -0000	1.8
+++ sources	11 Dec 2006 20:09:44 -0000	1.9
@@ -1,2 +1,2 @@
-85336e72018ecefa2f9999fc4e6f3eb8  jpackage-utils-1.6.6.tar.bz2
+a07616ac64fdcd7f16126227a8b7722c  jpackage-utils-1.7.3.tar.bz2
 652715135a35d6c70ac6e149d558379e  jpackage-utils-enable-gcj-support.patch

More information about the fedora-cvs-commits mailing list