pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 100887 from home:mvyskocil:branches:Base:System

Browse Source 
- push Stopgap fix for rhbz#461683 from to SUSE
  set_javacmd preffers JRE over JDK

OBS-URL: https://build.opensuse.org/request/show/100887
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=185
This commit is contained in:
Stephan Kulow 2012-01-26 15:38:11 +00:00 committed by Git OBS Bridge
parent 290ee0147e
commit 8c6234c115
5 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
macrosin.diff
View File

@ -1,6 +1,6 @@
--- ./macros.in.orig 2011-01-03 13:57:41.000000000 +0000 --- macros.in 2011-07-15 11:32:41.000000000 +0200
+++ ./macros.in 2011-05-12 14:32:18.000000000 +0000 +++ macros.in 2012-01-20 11:02:19.809126991 +0100
@@ -178,22 +178,22 @@ @@ -180,22 +180,22 @@
# Template for debug information sub-package. # Template for debug information sub-package.
%debug_package \ %debug_package \
@ -29,7 +29,7 @@
# The path to the gzip executable (legacy, use %{__gzip} instead). # The path to the gzip executable (legacy, use %{__gzip} instead).
%_gzipbin %{__gzip} %_gzipbin %{__gzip}
@@ -230,7 +230,8 @@ package or when debugging this package.\ @@ -232,7 +232,8 @@
%_tmppath %{_var}/tmp %_tmppath %{_var}/tmp
# Path to top of build area. # Path to top of build area.
@ -39,7 +39,7 @@
# The path to the unzip executable (legacy, use %{__unzip} instead). # The path to the unzip executable (legacy, use %{__unzip} instead).
%_unzipbin %{__unzip} %_unzipbin %{__unzip}
@@ -333,7 +333,7 @@ package or when debugging this package.\ @@ -335,7 +336,7 @@
# "w7.lzdio" lzma-alone level 7, lzma's default # "w7.lzdio" lzma-alone level 7, lzma's default
# #
#%_source_payload w9.gzdio #%_source_payload w9.gzdio
@ -48,16 +48,7 @@
# Algorithm to use for generating file checksum digests on build. # Algorithm to use for generating file checksum digests on build.
# If not specified or 0, MD5 is used. # If not specified or 0, MD5 is used.
@@ -417,7 +417,7 @@ package or when debugging this package.\ @@ -465,16 +466,22 @@
#
# Use internal dependency generator rather than external helpers?
-%_use_internal_dependency_generator 1
+%_use_internal_dependency_generator 1
#
# Filter GLIBC_PRIVATE Provides: and Requires:
@@ -463,16 +463,22 @@ print (t)\
# Undefined, missing or %{nil} will use package content (if available). # Undefined, missing or %{nil} will use package content (if available).
%_verify_file_context_path %{__file_context_path} %_verify_file_context_path %{__file_context_path}
@ -82,12 +73,9 @@
# #
# Path to file attribute classifications for automatic dependency # Path to file attribute classifications for automatic dependency
@@ -533,12 +539,12 @@ print (t)\ @@ -537,10 +544,10 @@
#
# Misc BDB tuning options # Misc BDB tuning options
-%__dbi_other mp_mmapsize=128Mb mp_size=64Mb %__dbi_other mp_mmapsize=128Mb mp_size=64Mb
+%__dbi_other mp_mmapsize=128Mb mp_size=64Mb
-%_dbi_config %{?__dbi_other} -%_dbi_config %{?__dbi_other}
+%_dbi_config %{?__dbi_other} nofsync +%_dbi_config %{?__dbi_other} nofsync
@ -98,7 +86,7 @@
#============================================================================== #==============================================================================
# ---- GPG/PGP/PGP5 signature macros. # ---- GPG/PGP/PGP5 signature macros.
@@ -857,7 +863,7 @@ print (t)\ @@ -859,7 +866,7 @@
%_build_vendor %{_host_vendor} %_build_vendor %{_host_vendor}
%_build_os %{_host_os} %_build_os %{_host_os}
%_host @host@ %_host @host@
@ -107,7 +95,7 @@
%_host_cpu @host_cpu@ %_host_cpu @host_cpu@
%_host_vendor @host_vendor@ %_host_vendor @host_vendor@
%_host_os @host_os@ %_host_os @host_os@
@@ -1020,6 +1026,181 @@ done \ @@ -1022,6 +1029,183 @@
%python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))") %python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1))")
%python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])") %python_version %(%{__python} -c "import sys; sys.stdout.write(sys.version[:3])")
@ -248,6 +236,7 @@
+# %3 options +# %3 options
+# %4 jars (separated by ':') +# %4 jars (separated by ':')
+# %5 the name of script you wish to create +# %5 the name of script you wish to create
+# %6 whether to prefer a jre over a sdk when finding a jvm
+# +#
+%jpackage_script() \ +%jpackage_script() \
+install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\ +install -d -m 755 $RPM_BUILD_ROOT%{_bindir}\
@ -258,6 +247,7 @@
+# JPackage Project <http://www.jpackage.org/>\ +# JPackage Project <http://www.jpackage.org/>\
+\ +\
+# Source functions library\ +# Source functions library\
+_prefer_jre="%{?6}"\
+. %{_javadir}-utils/java-functions\ +. %{_javadir}-utils/java-functions\
+\ +\
+# Source system prefs\ +# Source system prefs\
@ -289,7 +279,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# arch macro for all Intel i?86 compatibile processors # arch macro for all Intel i?86 compatibile processors
# (Note: This macro (and it's analogues) will probably be obsoleted when # (Note: This macro (and it's analogues) will probably be obsoleted when
@@ -1030,7 +1211,9 @@ done \ @@ -1032,7 +1216,9 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# arch macro for all supported ARM processors # arch macro for all supported ARM processors
@ -300,7 +290,7 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# arch macro for all supported Sparc processors # arch macro for all supported Sparc processors
@@ -1070,3 +1253,26 @@ done \ @@ -1072,3 +1258,26 @@
# \endverbatim # \endverbatim
#*/ #*/

1
python3-rpm.spec
View File

@ -16,6 +16,7 @@
# #
Name: python3-rpm Name: python3-rpm
Version: 4.9.1.2 Version: 4.9.1.2
Release: 0 Release: 0

1
rpm-python.spec
View File

@ -16,6 +16,7 @@
# #
Name: rpm-python Name: rpm-python
Version: 4.9.1.2 Version: 4.9.1.2
Release: 0 Release: 0

6
rpm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 20 11:43:05 UTC 2012 - mvyskocil@suse.cz
- push Stopgap fix for rhbz#461683 from to SUSE
set_javacmd preffers JRE over JDK
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 20 11:58:23 CET 2012 - dmueller@suse.de Fri Jan 20 11:58:23 CET 2012 - dmueller@suse.de

1
rpm.spec
View File

@ -16,6 +16,7 @@
# #
Name: rpm Name: rpm
BuildRequires: file-devel BuildRequires: file-devel
BuildRequires: libacl-devel BuildRequires: libacl-devel