[Jpackage-commits] dist/jpackage-utils/devel .cvsignore, 1.2, 1.3 jpackage-utils-enable-gcj-support.patch, NONE, 1.1 jpackage-utils-jnidir.patch, NONE, 1.1 jpackage-utils-own-mavendirs.patch, NONE, 1.1 jpackage-utils-prefer-jre.patch, NONE, 1.1 jpackage-utils-set-classpath.patch, NONE, 1.1 jpackage-utils-signed-jar.patch, NONE, 1.1 jpackage-utils.spec, 1.1, 1.2 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Sat Oct 15 04:36:04 CEST 2011


Update of /home/projects/jpackage/cvs/dist/jpackage-utils/devel
In directory ryu.zarb.org:/tmp/cvs-serv12691/devel

Modified Files:
	.cvsignore jpackage-utils.spec sources 
Added Files:
	jpackage-utils-enable-gcj-support.patch 
	jpackage-utils-jnidir.patch jpackage-utils-own-mavendirs.patch 
	jpackage-utils-prefer-jre.patch 
	jpackage-utils-set-classpath.patch 
	jpackage-utils-signed-jar.patch 
Log Message:
- initial import

--- NEW FILE: jpackage-utils-signed-jar.patch ---
--- java-utils/java-functions.orig	2008-04-01 13:57:42.000000000 -0400
+++ java-utils/java-functions	2010-10-27 21:20:30.000000000 -0400
@@ -290,8 +290,18 @@
 
    extension=$1
 
+   _JAVA_LIBDIR="$JAVA_LIBDIR"
+   _JAVALIBDIR_SIGNED=""
+
+   if [ x"$JPP_SIGNED" = x"1" -o x"$JPP_SIGNED" = x"2" ]; then
+       _JAVALIBDIR_SIGNED="${JAVA_LIBDIR}-signed"
+   elif [ x"$JPP_SIGNED" = x"4" ]; then
+       _JAVA_LIBDIR=""
+   fi 
+
    for jardir in "$JVM_LIBDIR" "$JAVAVER_JNIDIR" "$JAVAVER_LIBDIR" \
-                 "$JAVAAPP_LIBDIR" "$JNI_LIBDIR" "$JAVA_LIBDIR" ; do
+                 "$JNI_LIBDIR" "$_JAVALIBDIR_SIGNED" "$_JAVA_LIBDIR" ; do
+      [ "$jardir" = "$JAVA_LIBDIR" ] && [ x"$JPP_SIGNED" = x"2" ] && echo "$0: warning: Could not find signed $1 Java extension for this JVM. Falling back to $JAVA_LIBDIR." >&2 || :
       if [ -d "$jardir" ] ; then
          if [ -r "$jardir/$extension.jar" ] ; then
             echo "$jardir/$extension.jar"

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jpackage-utils/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	27 May 2008 14:53:28 -0000	1.2
--- .cvsignore	15 Oct 2011 02:36:01 -0000	1.3
***************
*** 1 ****
--- 1,3 ----
  jpackage-utils-1.7.5.tar.bz2
+ javapackages-0.2.6.tar.bz2
+ jpackage-utils-1.7.5-man-pages.tar.bz2

--- NEW FILE: jpackage-utils-jnidir.patch ---
diff --git a/java-utils/java-functions b/java-utils/java-functions
index 458b85a..d395a10 100644
--- a/java-utils/java-functions
+++ b/java-utils/java-functions
@@ -310,7 +310,8 @@ do_find_jar() {
    extension=$1
 
    for jardir in "$JVM_LIBDIR" "$JAVAVER_JNIDIR" "$JAVAVER_LIBDIR" \
-                 "$JAVAAPP_LIBDIR" "$JNI_LIBDIR" "$JAVA_LIBDIR" ; do
+                 "$JAVAAPP_LIBDIR" "$JNI_LIBDIR" "$JAVA_LIBDIR" \
+                 "$JAVAJNI_LIBDIR"; do
       if [ -d "$jardir" ] ; then
          if [ -r "$jardir/$extension.jar" ] ; then
             echo "$jardir/$extension.jar"
diff --git a/misc/macros.jpackage b/misc/macros.jpackage
index a767509..c6e1319 100644
--- a/misc/macros.jpackage
+++ b/misc/macros.jpackage
@@ -81,7 +81,14 @@
 #   - jars for Java standard x.y.z (usually symlinks to  %{_jnidir}-ext)
 # To simplify things only %{_jnidir} is defined.
 #
-%_jnidir        %{_prefix}/lib/java
+%_jnidir        %{_libdir}/java
+
+
+# 
+# Directory where architecture-independent that use
+# architecture-dependent files are placed
+#
+%_javajnidir    %{_datadir}/java-jni
 
 #
 # Root directory where all javadoc is installed. Also already in RH macros.

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jpackage-utils/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	27 May 2008 14:53:28 -0000	1.2
--- sources	15 Oct 2011 02:36:01 -0000	1.3
***************
*** 1 ****
--- 1,3 ----
  5039b51d1e80e45da27faf131448eaa8  jpackage-utils-1.7.5.tar.bz2
+ ffb324f09fd828c242f6d189b40663b9  javapackages-0.2.6.tar.bz2
+ bf169caea2a705d319f67938a7d8b278  jpackage-utils-1.7.5-man-pages.tar.bz2

--- NEW FILE: jpackage-utils-set-classpath.patch ---
diff -up ./java-utils/java-functions.sav ./java-utils/java-functions
--- ./java-utils/java-functions.sav	2010-06-28 17:38:44.000000000 -0400
+++ ./java-utils/java-functions	2010-06-28 17:38:54.000000000 -0400
@@ -124,7 +124,7 @@ run() {
     echo "arguments used: $@"
   fi
   # let's start
-  exec $JAVACMD $FLAGS -classpath $CLASSPATH $OPTIONS $MAIN_CLASS "$@"
+  exec "$JAVACMD" $FLAGS -classpath "$CLASSPATH" $OPTIONS "$MAIN_CLASS" "$@"
 }
 
 # Set JVM-related directories

--- NEW FILE: jpackage-utils-prefer-jre.patch ---
--- jpackage-utils-1.7.5/java-utils/java-functions	2008-04-01 20:57:42.000000000 +0300
+++ jpackage-utils-1.7.5/java-utils/java-functions	2009-05-04 19:53:21.000000000 +0300
@@ -24,11 +24,26 @@ fi
 [ ! -z "$_JAVA_HOME" -a -d "$_JAVA_HOME" ] && JAVA_HOME="$_JAVA_HOME"
 
 # Test default JRE/JVM roots if nothing is defined yet
-[ -z "$JAVA_HOME" -a -d "$JVM_ROOT/java" ] && JAVA_HOME="$JVM_ROOT/java"
-[ -z "$JAVA_HOME" -a -d "$JVM_ROOT/jre" ] && JAVA_HOME="$JVM_ROOT/jre"
+_set_java_home() {
+  if [ -z "$JAVA_HOME" ] ; then
+    local _java_dirs="java"
+    case "$_prefer_jre" in
+      1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) _java_dirs="jre $_java_dirs" ;;
+      *)                               _java_dirs="$_java_dirs jre" ;;
+    esac
+    for d in $_java_dirs ; do
+      if [ -d "$JVM_ROOT/$d" ] ; then
+        JAVA_HOME="$JVM_ROOT/$d"
+        break
+      fi
+    done
+  fi
+}
 
 # Set the java virtual machine
 set_jvm() {
+  _set_java_home
+
   # use $JAVA_HOME if defined
   if [ -n "$JAVA_HOME" ] ; then
     return
@@ -60,6 +75,8 @@ set_jvm() {
 # Set the classpath
 # This requires a valid JAVA_HOME, JAVACMD, and JAVA_LIBDIR
 set_classpath() {
+  _set_java_home
+
   # get local classpath first
   jars=$@
   if [ -n "$ADDITIONAL_JARS" ] ; then
@@ -130,6 +147,8 @@ run() {
 # Set JVM-related directories
 # Requires a correct $JAVA_LIBDIR, $JAVA_HOME and $JAVA_CMD
 set_jvm_dirs() {
+    _set_java_home
+
     # Jar repository provided by the JVM
     JVM_LIBDIR=$JVM_ROOT-exports/$(echo "$JAVA_HOME" |\
         sed -n "s+$JVM_ROOT/\([-_[:alnum:].]*\)\(.*\)+\1+p")
--- jpackage-utils-1.7.5/misc/macros.jpackage	2008-01-04 13:21:42.000000000 +0200
+++ jpackage-utils-1.7.5/misc/macros.jpackage	2009-05-04 20:00:58.000000000 +0300
@@ -301,6 +301,7 @@ EOF\
 # %3	options
 # %4	jars (separated by ':')
 # %5    the name of script you wish to create
+# %6    whether to prefer a jre over a sdk when finding a jvm
 #
 %jpackage_script() \
 install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\
@@ -311,6 +312,7 @@ cat > $RPM_BUILD_ROOT%{_bindir}/%5 << EO
 # JPackage Project <http://www.jpackage.org/>\
 \
 # Source functions library\
+_prefer_jre="%{?6}"\
 . %{_javadir}-utils/java-functions\
 \
 # Source system prefs\

--- NEW FILE: jpackage-utils-own-mavendirs.patch ---
diff -up ./misc/macros.jpackage.sav ./misc/macros.jpackage
--- ./misc/macros.jpackage.sav	2008-01-04 06:21:42.000000000 -0500
+++ ./misc/macros.jpackage	2008-07-08 14:41:49.000000000 -0400
@@ -88,11 +88,14 @@
 #
 %_javadocdir     %{_datadir}/javadoc
 
+# Directory for maven poms
+%_mavenpomdir %{_datadir}/maven2/poms
+
 #
 # Directory for maven depmaps
 #
-%_mavendepmapdir /etc/maven
-%_mavendepmapfragdir /etc/maven/fragments
+%_mavendepmapdir %{_sysconfdir}/maven
+%_mavendepmapfragdir %{_sysconfdir}/maven/fragments
 
 #
 # Current default JVM home.

--- NEW FILE: jpackage-utils-enable-gcj-support.patch ---
diff -up ./misc/macros.jpackage.sav ./misc/macros.jpackage
--- ./misc/macros.jpackage.sav	2008-01-04 06:21:42.000000000 -0500
+++ ./misc/macros.jpackage	2008-09-24 11:00:36.000000000 -0400
@@ -171,6 +171,10 @@ echo -e "</dependencies>\\n" >> %{_maven
 %{nil}
 
 #==============================================================================
+# ---- GCJ support
+%_gcj_support 0
+
+#==============================================================================
 # ---- default icons directories as per the icon theme freedesktop spec
 
 %_iconstheme    hicolor

Index: jpackage-utils.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jpackage-utils/devel/jpackage-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** jpackage-utils.spec	27 May 2008 14:53:28 -0000	1.1
--- jpackage-utils.spec	15 Oct 2011 02:36:01 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2008, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 29,55 ****
  #
  
! %define distver 1.7
  %define section free
  
  Name:           jpackage-utils
! Version:        1.7.5
! Release:        1jpp
  Epoch:          0
  Summary:        JPackage utilities
! License:        JPackage License
! URL:            http://www.jpackage.org/
! Source0:        %{name}-%{version}.tar.bz2
  Group:          Utilities
! Vendor:         %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
! Distribution:   %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
! BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
! 
! BuildArch:      noarch
! AutoReqProv:    no
! BuildRequires:  %{__awk}
! BuildRequires:  %{__grep}
  Requires:       /bin/egrep
  Requires:       /bin/sed
  Requires:       /usr/bin/perl
  
  %description
--- 29,71 ----
  #
  
! %global gcj_support 1
! 
! %global distver 1.7
  %define section free
  
+ %{!?_rpmconfigdir:%global _rpmconfigdir %{_sysconfdir}/rpm}
+ 
+ %global fj_version 0.2.6
+ 
  Name:           jpackage-utils
! Version:        5.0.0
! Release:        2.3%{?dist}
  Epoch:          0
  Summary:        JPackage utilities
! License:        BSD
  Group:          Utilities
! URL:            http://www.jpackage.org/
! # FIXME: create a new one for JPP 5
! #Source0:        %{name}-%{version}.tar.bz2
! # cvs -d :pserver:anonymous at jpackage.org:/home/projects/jpackage/cvs export -r JPP_1_7_5 src/jpackage-utils
! # cd src/jpackage-utils/
! # ./mkdist.sh
! Source0:        %{name}-1.7.5.tar.bz2
! Source1:        %{name}-1.7.5-man-pages.tar.bz2
! Source8:        https://fedorahosted.org/released/javapackages/javapackages-%{fj_version}.tar.bz2
! Patch0:         %{name}-enable-gcj-support.patch
! Patch1:         %{name}-own-mavendirs.patch
! Patch2:         %{name}-signed-jar.patch
! Patch3:         jpackage-utils-jnidir.patch
! Patch4:         jpackage-utils-prefer-jre.patch
! Patch5:         jpackage-utils-set-classpath.patch
! Requires:       coreutils
! Requires:       findutils
  Requires:       /bin/egrep
  Requires:       /bin/sed
  Requires:       /usr/bin/perl
+ AutoReqProv:    no
+ BuildArch:      noarch
+ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 92,99 ****
  use with maven2, a header file for spec files etc.
  
! 
  %prep
! %setup -q
  
  
  %build
--- 108,132 ----
  use with maven2, a header file for spec files etc.
  
! #FIXME remove the -n after we get the 5.0 tar ball
  %prep
! %setup -q -n jpackage-utils-1.7.5
! %patch0 -p0
! %patch1 -p1
! %patch2 -p0
! #%%patch3 -p1
! %patch4 -p1
! %patch5 -p1
! %setup -q -T -D -b 1 -n jpackage-utils-1.7.5
! 
! #cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE8} .
! 
! tar xf %{SOURCE8}
  
+ for manpage in `%{_bindir}/find man/ -type f`; do
+     %{__mv} ${manpage} ${manpage}.bak
+     %{_bindir}/iconv -f iso8859-1 -t utf8 -o ${manpage} ${manpage}.bak
+     %{__perl} -pi -e 's/1\.7\.\d+/%{version}-%{release}/g;' ${manpage}
+     %{__rm} ${manpage}.bak
+ done
  
  %build
***************
*** 101,105 ****
   > etc/jpackage-release
  
- 
  %install
  rm -rf $RPM_BUILD_ROOT
--- 134,137 ----
***************
*** 111,120 ****
      jvmlibdir jvmdatadir jvmsysconfdir \
      jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
!     javadir jnidir javadocdir mavendepmapdir; do
!   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" misc/macros.jpackage | %{__awk} '{ print $2 }'))
  done
  
  install -dm 755 ${RPM_BUILD_ROOT}%{_bindir}
  install -dm 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{java,rpm}
  install -dm 755 ${RPM_BUILD_ROOT}${_jvmdir}
  install -dm 755 ${RPM_BUILD_ROOT}${_jvmjardir}
--- 143,158 ----
      jvmlibdir jvmdatadir jvmsysconfdir \
      jvmcommonlibdir jvmcommondatadir jvmcommonsysconfdir \
!     javadir jnidir javadocdir mavenpomdir \
!     mavendepmapdir mavendepmapfragdir; do
!   export _${dir}=$(rpm --eval $(%{__grep} -E "^%_${dir}\b" \
!     misc/macros.jpackage | %{__awk} '{ print $2 }'))
  done
  
  install -dm 755 ${RPM_BUILD_ROOT}%{_bindir}
  install -dm 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/{java,rpm}
+ %if %{gcj_support}
+ install -dm 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/java/security
+ install -dm 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/java/security/security.d
+ %endif
  install -dm 755 ${RPM_BUILD_ROOT}${_jvmdir}
  install -dm 755 ${RPM_BUILD_ROOT}${_jvmjardir}
***************
*** 127,135 ****
  install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir}
  install -dm 755 ${RPM_BUILD_ROOT}${_javadir}
  install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
! install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{utils,ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0}
! install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{ext,1.4.0,1.4.1,1.4.2,1.5.0,1.6.0}
  install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
! install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapdir}
  
  install -pm 755 bin/* ${RPM_BUILD_ROOT}%{_bindir}
--- 165,182 ----
  install -dm 755 ${RPM_BUILD_ROOT}${_jvmcommonsysconfdir}
  install -dm 755 ${RPM_BUILD_ROOT}${_javadir}
+ install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-signed
+ install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-utils
+ install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-ext
+ install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.3.1,1.4.0,1.4.1,1.4.2}
+ install -dm 755 ${RPM_BUILD_ROOT}${_javadir}-{1.5.0,1.6.0,1.7.0}
  install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
! install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-ext
! install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}
! install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.3.1,1.4.0,1.4.1,1.4.2}
! install -dm 755 ${RPM_BUILD_ROOT}${_jnidir}-{1.5.0,1.6.0,1.7.0}
  install -dm 755 ${RPM_BUILD_ROOT}${_javadocdir}
! install -dm 755 ${RPM_BUILD_ROOT}${_mandir}/{man1,man5,man7}
! install -dm 755 ${RPM_BUILD_ROOT}${_mavenpomdir}
! install -dm 755 ${RPM_BUILD_ROOT}${_mavendepmapfragdir}
  
  install -pm 755 bin/* ${RPM_BUILD_ROOT}%{_bindir}
***************
*** 137,142 ****
  
  # 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
--- 184,191 ----
  
  # 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
***************
*** 154,158 ****
  JVM_ROOT=${_jvmdir}
  
! # You can define a system-wide JVM root here if you're not using the default one
  #JAVA_HOME=\$JVM_ROOT/java
  
--- 203,215 ----
  JVM_ROOT=${_jvmdir}
  
! # You can define a system-wide JVM root here if you're not using the
! # default one.
! #
! # If you have the a base JRE package installed
! # (e.g. java-1.6.0-openjdk):
! #JAVA_HOME=\$JVM_ROOT/jre
! #
! # If you have the a devel JDK package installed
! # (e.g. java-1.6.0-openjdk-devel):
  #JAVA_HOME=\$JVM_ROOT/java
  
***************
*** 165,177 ****
  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}
--- 222,273 ----
  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}${_javadir}-utils/xml
  install -pm 644 xml/* ${RPM_BUILD_ROOT}${_javadir}-utils/xml
  
+ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1
+ install -pm 644 man/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/
+ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man5
+ install -pm 644 man/*.5 ${RPM_BUILD_ROOT}%{_mandir}/man5/
+ %{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man7
+ install -pm 644 man/*.7 ${RPM_BUILD_ROOT}%{_mandir}/man7/
+ 
+ # fedora-specific extensions
+ pushd javapackages-%{fj_version}
+ # Add the provides script
+ install -m0755 -D depgenerators/maven.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/maven.prov
+ install -m0755 -D depgenerators/osgi.prov $RPM_BUILD_ROOT%{_rpmconfigdir}/osgi.prov
+ install -m0755 -D depgenerators/osgi.req $RPM_BUILD_ROOT%{_rpmconfigdir}/osgi.req
+ # Add the maven poms file attribute entry (rpm >= 4.9.0)
+ install -m0644 -D depgenerators/fileattrs/maven.attr \
+                   $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/maven.attr
+ install -m0644 -D depgenerators/fileattrs/osgi.attr \
+                   $RPM_BUILD_ROOT%{_rpmconfigdir}/fileattrs/osgi.attr
+ 
+ install -pm 644 macros.fjava ${RPM_BUILD_ROOT}%{_sysconfdir}/rpm
+ install -pm 644 scripts/maven_depmap.py ${RPM_BUILD_ROOT}${_javadir}-utils
+ popd
+ 
  cat <<EOF > %{name}-%{version}.files
  %{_bindir}/*
! %{_mandir}/man1/build-classpath-directory.1*
! %{_mandir}/man1/build-classpath.1*
! %{_mandir}/man1/build-jar-repository.1*
! %{_mandir}/man1/check-binary-files.1*
! %{_mandir}/man1/clean-binary-files.1*
! %{_mandir}/man1/create-jar-links.1*
! %{_mandir}/man1/diff-jars.1*
! %{_mandir}/man1/find-jar.1*
! %{_mandir}/man1/jvmjar.1*
! %{_mandir}/man1/rebuild-jar-repository.1*
! %{_mandir}/man1/rebuild-security-providers.1*
! %{_mandir}/man5/java.conf.5*
! %{_mandir}/man7/java-functions.7*
! %{_mandir}/man7/jpackage-utils.7*
! %{_mandir}/man7/macros.jpackage.7*
  %dir %{_sysconfdir}/java
+ %if %{gcj_support}
+ %dir %{_sysconfdir}/java/security
+ %dir %{_sysconfdir}/java/security/security.d
+ %endif
  %dir ${_jvmdir}
  %dir ${_jvmjardir}
***************
*** 185,205 ****
  %dir ${_javadir}
  %dir ${_javadir}-*
  %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
  
- 
  %clean
  rm -rf $RPM_BUILD_ROOT
  
! 
  %postun
  if [ $1 -eq 0 ]; then
--- 281,308 ----
  %dir ${_javadir}
  %dir ${_javadir}-*
+ ${_javadir}-utils/*
  %dir ${_jnidir}
  %dir ${_jnidir}-*
  %dir ${_javadocdir}
+ %dir %{_datadir}/maven2
+ %dir ${_mavenpomdir}
  %dir ${_mavendepmapdir}
! %dir ${_mavendepmapfragdir}
! %{_rpmconfigdir}/*.prov
! %{_rpmconfigdir}/*.req
! %dir %{_rpmconfigdir}/fileattrs
! %{_rpmconfigdir}/fileattrs/*.attr
  %config %{_sysconfdir}/java/jpackage-release
  %config(noreplace) %{_sysconfdir}/java/java.conf
  %config(noreplace) %{_sysconfdir}/java/font.properties
+ %config(noreplace) %{_sysconfdir}/rpm/macros.fjava
  %config(noreplace) %{_sysconfdir}/rpm/macros.jpackage
  %config(noreplace) ${_mavendepmapdir}/maven2-depmap.xml
  EOF
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
! %if 0
  %postun
  if [ $1 -eq 0 ]; then
***************
*** 221,225 ****
    fi
  done
! 
  
  %files -f %{name}-%{version}.files
--- 324,328 ----
    fi
  done
! %endif
  
  %files -f %{name}-%{version}.files
***************
*** 227,232 ****
  %doc LICENSE.txt HEADER.JPP doc/* etc/httpd-javadoc.conf
  
- 
  %changelog
  * Tue Apr  1 2008 Ville Skyttä <scop at jpackage.org> - 0:1.7.5-1jpp
  - Workaround a possible sed bug (or my misunderstanding of it?) in
--- 330,351 ----
  %doc LICENSE.txt HEADER.JPP doc/* etc/httpd-javadoc.conf
  
  %changelog
+ * Mon Sep 19 2011  David Walluck <dwalluck at redhat.com> 0:5.0.0-2.3
+ - merge Fedora extensions (javapackages-0.2.6.tar.bz2)
+ 
+ * Thu Feb 03 2011 David Walluck <dwalluck at redhat.com> 0:5.0.0-2.2
+ - fix typo in signed-jar patch
+ 
+ * Mon Apr 13 2009 David Walluck <dwalluck at redhat.com> 0:5.0.0-2.1
+ - merge with 0:5.0.0-2 and 0:1.7.5-3.12
+ - add ${_javadir}-signed directory
+ - add signed-jar patch
+ 
+ * Mon Apr 13 2009 David Walluck <dwalluck at redhat.com> 0:5.0.0-2
+ - add man pages
+ 
+ * Tue May 27 2008 Fernando Nasser <fnasser at jpackage.org> 0:5.0.0-1
+ - Base JPP 5 jpackage-utils on the latest JPP 1.7 one
+ 
  * Tue Apr  1 2008 Ville Skyttä <scop at jpackage.org> - 0:1.7.5-1jpp
  - Workaround a possible sed bug (or my misunderstanding of it?) in
***************
*** 297,301 ****
  * Wed Dec 15 2004 Robert Ottenhag <support at bea.com> -  0:1.6.2-1jpp
  - Reapply all updates from 1.5.40-1jpp o 1.5.42-1jpp
!   + Add support for splitting the installation of Java VMs/SDK/JREs 
      according to FHS 2.3 in its architecture dependent, architecture
      independent, and configuration parts. Added new macros and dirs
--- 416,420 ----
  * Wed Dec 15 2004 Robert Ottenhag <support at bea.com> -  0:1.6.2-1jpp
  - Reapply all updates from 1.5.40-1jpp o 1.5.42-1jpp
!   + Add support for splitting the installation of Java VMs/SDK/JREs
      according to FHS 2.3 in its architecture dependent, architecture
      independent, and configuration parts. Added new macros and dirs
***************
*** 303,307 ****
      - %%{_jvmdatadir}, defined as %%{_datadir}/jvm
      - %%{_jvmsysconfdir}, defined as %%{_sysconfdir}/jvm
!   + Add support for splitting the installation of Java VMs/SDK/JREs 
      in its common architecture dependent, architecture
      independent, and configuration parts. Added new macros and dirs
--- 422,426 ----
      - %%{_jvmdatadir}, defined as %%{_datadir}/jvm
      - %%{_jvmsysconfdir}, defined as %%{_sysconfdir}/jvm
!   + Add support for splitting the installation of Java VMs/SDK/JREs
      in its common architecture dependent, architecture
      independent, and configuration parts. Added new macros and dirs
***************
*** 398,402 ****
  * Tue Jun 10 2003 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> 0:1.5.22-1jpp
  - more correct java version detection regexp, courtesy of Scott Brickner
! - allow creation of harlink/copy jar repositories since tomcat4 seems to need 
    this (reported by Greg Barton)
  
--- 517,521 ----
  * Tue Jun 10 2003 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> 0:1.5.22-1jpp
  - more correct java version detection regexp, courtesy of Scott Brickner
! - allow creation of harlink/copy jar repositories since tomcat4 seems to need
    this (reported by Greg Barton)
  




More information about the JPackage-commits mailing list