Selaa lähdekoodia

fix upgrade problem

Ralf S. Engelschall 24 vuotta sitten
vanhempi
commit
9c313bccbf
1 muutettua tiedostoa jossa 13 lisäystä ja 12 poistoa
  1. 13 12
      openpkg/openpkg.spec

+ 13 - 12
openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020204
-%define       R_openpkg 20020204
+%define       V_openpkg 20020206
+%define       R_openpkg 20020206
 
 #   the used software versions
 %define       V_rpm     4.0.2
@@ -729,16 +729,17 @@ Provides:     OpenPKG
           echo $LOGNAME`
 
     #   determine runtime details (for both inside and outside RPM!!)
-    #   bootstrapping: $xxx is set
-    #   upgrading:     %{l_xxx} is set
-    [ ".$susr" = . ] && susr="%{l_susr}"
-    [ ".$sgrp" = . ] && sgrp="%{l_sgrp}"
-    [ ".$musr" = . ] && musr="%{l_musr}"
-    [ ".$mgrp" = . ] && mgrp="%{l_mgrp}"
-    [ ".$rusr" = . ] && rusr="%{l_rusr}"
-    [ ".$rgrp" = . ] && rgrp="%{l_rgrp}"
-    [ ".$nusr" = . ] && nusr="%{l_nusr}"
-    [ ".$ngrp" = . ] && ngrp="%{l_ngrp}"
+    #   - bootstrapping: $xxx is set from aux.wrapbin.sh
+    #   - upgrading new: %{l_[smrn]{usr,grp}} is set via rpmmacros
+    #   - upgrading old: %{l_[smrn]{usr,grp}} is not set at all
+    [ ".$susr" = . ] && susr="%{?l_susr}%{!?l_susr:root}"
+    [ ".$sgrp" = . ] && sgrp="%{?l_sgrp}%{!?l_sgrp:wheel}"
+    [ ".$musr" = . ] && musr="%{?l_musr}%{!?l_musr:%{l_fsusr}}"
+    [ ".$mgrp" = . ] && mgrp="%{?l_mgrp}%{!?l_mgrp:%{l_fsgrp}}"
+    [ ".$rusr" = . ] && rusr="%{?l_rusr}%{!?l_rusr:%{l_fsusr}-r}"
+    [ ".$rgrp" = . ] && rgrp="%{?l_rgrp}%{!?l_rgrp:%{l_fsgrp}-r}"
+    [ ".$nusr" = . ] && nusr="%{?l_nusr}%{!?l_nusr:%{l_fsusr}-n}"
+    [ ".$ngrp" = . ] && ngrp="%{?l_ngrp}%{!?l_ngrp:%{l_fsgrp}-n}"
 
     #   determine prefix
     prefix="%{l_prefix}"