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

- make _rundir configurable

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=328
This commit is contained in:
Michael Schröder 2014-04-25 13:42:44 +00:00 committed by Git OBS Bridge
parent 4a484f2855
commit 5b698646a0
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpm-suse_macros
View File

@ -6,7 +6,6 @@
%_mandir %{_prefix}/share/man %_mandir %{_prefix}/share/man
%_sysconfdir /etc %_sysconfdir /etc
%_localstatedir /var %_localstatedir /var
%_rundir /run
%_defaultdocdir %{_usr}/share/doc/packages %_defaultdocdir %{_usr}/share/doc/packages
# package build macros # package build macros

5
rpm.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 25 15:41:57 CEST 2014 - mls@suse.de
- make _rundir configurable
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 22 09:53:19 UTC 2014 - coolo@suse.com Tue Apr 22 09:53:19 UTC 2014 - coolo@suse.com

4
rpm.spec
View File

@ -137,6 +137,7 @@ Patch92: find-lang-python.patch
Patch93: weakdepscompat.diff Patch93: weakdepscompat.diff
Patch94: checksepwarn.diff Patch94: checksepwarn.diff
Patch95: exportoldtags.diff Patch95: exportoldtags.diff
Patch96: rundir.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff Patch6464: auto-config-update-aarch64-ppc64le.diff
Patch68000: m68k.patch Patch68000: m68k.patch
Patch68001: debugedit-m68k.patch Patch68001: debugedit-m68k.patch
@ -226,7 +227,7 @@ rm -f rpmdb/db.h
%patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
%patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
%patch -P 80 -P 82 -P 85 %patch -P 80 -P 82 -P 85
%patch -P 92 -P 93 -P 94 -P 95 %patch -P 92 -P 93 -P 94 -P 95 -P 96
%ifarch aarch64 ppc64le %ifarch aarch64 ppc64le
%patch6464 %patch6464
@ -274,6 +275,7 @@ sed -i -e 's,{PYTHON_VERSION}mu,{PYTHON_VERSION}mu python${PYTHON_VERSION}m,' co
./configure --disable-dependency-tracking --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ ./configure --disable-dependency-tracking --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
--libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \ --libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \
--with-vendor=suse \ --with-vendor=suse \
--with-rundir=/run \
--with-selinux --with-internal-beecrypt \ --with-selinux --with-internal-beecrypt \
--with-acl --with-cap --enable-shared %{?with_python: --enable-python} $BUILDTARGET --with-acl --with-cap --enable-shared %{?with_python: --enable-python} $BUILDTARGET

26
rundir.diff Normal file
View File

@ -0,0 +1,26 @@
--- configure.ac.orig 2014-04-25 13:40:13.808532251 +0000
+++ configure.ac 2014-04-25 13:40:13.822532172 +0000
@@ -814,6 +814,13 @@ AC_SUBST(RPMCANONVENDOR)
AC_SUBST(RPMCANONOS)
AC_SUBST(RPMCANONGNU)
+RUNDIR="/run"
+AC_ARG_WITH([rundir],
+ AS_HELP_STRING([--with-rundir=RUNDIR], [specify run-time variable directory]),
+ [RUNDIR=$withval])
+AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
+AC_SUBST(RUNDIR)
+
if test X"$prefix" = XNONE ; then
usrprefix="$ac_default_prefix"
else
--- platform.in.orig 2014-04-25 13:40:13.823532166 +0000
+++ platform.in 2014-04-25 13:41:13.034198906 +0000
@@ -44,6 +44,7 @@
%_initddir %{_sysconfdir}/init.d
# Deprecated misspelling, present for backwards compatibility.
%_initrddir %{_initddir}
+%_rundir @RUNDIR@
%_defaultdocdir %{_datadir}/doc