Browse Source

fix PR#205, use variable %{l_susr} not constant root

Thomas Lotterer 23 years ago
parent
commit
a51f90cbeb

+ 1 - 1
apache/apache.spec

@@ -919,7 +919,7 @@ AutoReqProv:  no
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
 %if "%{with_suexec}" == "yes"
-        '%attr(4755,root,%{l_mgrp}) %{l_prefix}/sbin/suexec' \
+        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/suexec' \
 %endif
         '%config %{l_prefix}/etc/apache/*' \
 %if "%{with_mod_ssl}" == "yes"

+ 1 - 1
exim/exim.spec

@@ -178,7 +178,7 @@ Conflicts:    sendmail, postfix, ssmtp
         %{l_files_std} \
         '%not %dir %{l_prefix}/etc/fsl' \
         '%config %{l_prefix}/etc/fsl/fsl.exim' \
-         '%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/exim'
+         '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/exim'
 
 %files -f files
 

+ 4 - 4
gnupg/gnupg.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Cryptography
 License:      GPL
 Version:      1.2.2
-Release:      20030707
+Release:      20030717
 
 #   package options
 %option       with_idea  no
@@ -45,8 +45,8 @@ Source1:      ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, make
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030717, make
+PreReq:       OpenPKG, openpkg >= 20030717
 BuildPreReq:  zlib
 PreReq:       zlib
 AutoReq:      no
@@ -88,7 +88,7 @@ Provides:     OPENPGP
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/gpg'
+        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/gpg'
 
 %files -f files
 

+ 4 - 4
jitterbug/jitterbug.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Database
 License:      GPL
 Version:      1.6.2.3
-Release:      20030709
+Release:      20030717
 
 #   list of sources
 Source0:      ossp-jitterbug-%{version}.tar.gz
@@ -42,8 +42,8 @@ Source1:      config.tar
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20030103
-PreReq:       OpenPKG, openpkg >= 20030103, MTA, apache, gzip
+BuildPreReq:  OpenPKG, openpkg >= 20030717
+PreReq:       OpenPKG, openpkg >= 20030717, MTA, apache, gzip
 BuildPreReq:  zlib
 PreReq:       zlib
 AutoReq:      no
@@ -103,7 +103,7 @@ AutoReqProv:  no
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%config %{l_prefix}/etc/jitterbug/*' \
-        '%attr(04755,root,%{l_mgrp}) %{l_prefix}/bin/jitterbug-*'
+        '%attr(04755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/jitterbug-*'
 
 %files -f files
 

+ 1 - 1
powerdns/powerdns.spec

@@ -173,7 +173,7 @@ Conflicts:    bind, bind8
         '%not %dir %{l_prefix}/etc/fsl' \
         '%attr(775,%{l_musr},%{l_rgrp}) %{l_prefix}/var/powerdns' \
         '%config %{l_prefix}/etc/fsl/fsl.powerdns' \
-        '%config %attr(0600,root,%{l_mgrp}) %{l_prefix}/etc/powerdns/*'
+        '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/powerdns/*'
 
 %files -f files
 

+ 1 - 1
screen/screen.spec

@@ -83,7 +83,7 @@ AutoReqProv:  no
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/screen' \
+        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/screen' \
         '%config %{l_prefix}/etc/screen/screenrc'
 
 %files -f files

+ 3 - 3
sudo/sudo.spec

@@ -135,9 +135,9 @@ AutoReqProv:  no
         %{l_files_std} \
         '%not %dir %{l_prefix}/etc/fsl' \
         '%config %{l_prefix}/etc/fsl/fsl.sudo' \
-        '%attr(4111,root,%{l_mgrp}) %{l_prefix}/bin/sudo' \
-        '%attr(0111,root,%{l_mgrp}) %{l_prefix}/sbin/visudo' \
-        '%config %attr(0400,root,%{l_mgrp}) %{l_prefix}/etc/sudo/sudoers'
+        '%attr(4111,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/sudo' \
+        '%attr(0111,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/visudo' \
+        '%config %attr(0400,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sudo/sudoers'
 
 %files -f files
 

+ 4 - 4
traceroute/traceroute.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Network
 License:      BSD
 Version:      1.4a12
-Release:      20020206
+Release:      20030717
 
 #   list of sources
 Source0:      ftp://ftp.ee.lbl.gov/traceroute-%{version}.tar.gz
@@ -41,8 +41,8 @@ Source0:      ftp://ftp.ee.lbl.gov/traceroute-%{version}.tar.gz
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206
-PreReq:       OpenPKG, openpkg >= 20020206
+BuildPreReq:  OpenPKG, openpkg >= 20030717
+PreReq:       OpenPKG, openpkg >= 20030717
 AutoReq:      no
 AutoReqProv:  no
 
@@ -75,7 +75,7 @@ AutoReqProv:  no
         traceroute.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%attr(4711,root,%{l_mgrp}) %{l_prefix}/sbin/traceroute'
+        '%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/traceroute'
 
 %files -f files
 

+ 4 - 4
xterm/xterm.spec

@@ -39,7 +39,7 @@ Distribution: OpenPKG [PLUS]
 Group:        XWindow
 License:      X11
 Version:      %{V_whole}
-Release:      20030610
+Release:      20030717
 
 #   list of sources
 Source0:      ftp://invisible-island.net/xterm/xterm-%{V_xterm}.tgz
@@ -49,8 +49,8 @@ Source2:      http://www.thrysoee.dk/xtermcontrol/xtermcontrol-%{V_xtermcontrol}
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20020206, X11
-PreReq:       OpenPKG, openpkg >= 20020206, X11
+BuildPreReq:  OpenPKG, openpkg >= 20030717, X11
+PreReq:       OpenPKG, openpkg >= 20030717, X11
 AutoReq:      no
 AutoReqProv:  no
 
@@ -124,7 +124,7 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/aclocal
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%attr(4755,root,%{l_mgrp}) %{l_prefix}/bin/xterm'
+        '%attr(4755,%{l_susr},%{l_mgrp}) %{l_prefix}/bin/xterm'
 
 %files -f files