This commit is contained in:
OBS User unknown
committed by
Git OBS Bridge
Git OBS Bridge
parent
64a650bf09
commit
8c64a58df3
167
macrosin.diff
167
macrosin.diff
@@ -4,7 +4,7 @@ Index: macros.in
|
||||
===================================================================
|
||||
--- macros.in.orig
|
||||
+++ macros.in
|
||||
@@ -166,22 +166,22 @@
|
||||
@@ -171,22 +171,22 @@
|
||||
|
||||
# Template for debug information sub-package.
|
||||
%debug_package \
|
||||
@@ -33,7 +33,7 @@ Index: macros.in
|
||||
|
||||
# The path to the gzip executable (legacy, use %{__gzip} instead).
|
||||
%_gzipbin %{__gzip}
|
||||
@@ -218,7 +218,7 @@ package or when debugging this package.\
|
||||
@@ -223,7 +223,7 @@ package or when debugging this package.\
|
||||
%_tmppath %{_var}/tmp
|
||||
|
||||
# Path to top of build area.
|
||||
@@ -42,7 +42,7 @@ Index: macros.in
|
||||
|
||||
# The path to the unzip executable (legacy, use %{__unzip} instead).
|
||||
%_unzipbin %{__unzip}
|
||||
@@ -323,7 +323,7 @@ package or when debugging this package.\
|
||||
@@ -328,7 +328,7 @@ package or when debugging this package.\
|
||||
# "w9.bzdio" bzip2 level 9.
|
||||
#
|
||||
#%_source_payload w9.gzdio
|
||||
@@ -51,7 +51,7 @@ Index: macros.in
|
||||
|
||||
# The signature to use and the location of configuration files for
|
||||
# signing packages with PGP.
|
||||
@@ -371,7 +371,7 @@ package or when debugging this package.\
|
||||
@@ -383,7 +383,7 @@ package or when debugging this package.\
|
||||
|
||||
#
|
||||
# Use internal dependency generator rather than external helpers?
|
||||
@@ -60,7 +60,17 @@ Index: macros.in
|
||||
|
||||
#
|
||||
# Filter GLIBC_PRIVATE Provides: and Requires:
|
||||
@@ -420,20 +420,22 @@ print (t)\
|
||||
@@ -426,16 +426,22 @@ print (t)\
|
||||
# Undefined, missing or %{nil} will use package content (if available).
|
||||
%_verify_file_context_path %{__file_context_path}
|
||||
|
||||
+# maxnum,cuttime,minnum
|
||||
+# 2006/07/01 (SLES10 GA)
|
||||
+%_binarychangelogtrim 0,1151704800,10
|
||||
+
|
||||
#
|
||||
# Path to scripts to autogenerate package dependencies,
|
||||
#
|
||||
# Note: Used iff _use_internal_dependency_generator is zero.
|
||||
#%__find_provides @RPMCONFIGDIR@/rpmdeps --provides
|
||||
#%__find_requires @RPMCONFIGDIR@/rpmdeps --requires
|
||||
@@ -75,21 +85,7 @@ Index: macros.in
|
||||
|
||||
#
|
||||
# Path to scripts to autogenerate per-interpreter package dependencies,
|
||||
#
|
||||
# Note: Used iff _use_internal_dependency_generator is non-zero. The
|
||||
# helpers are also used by @RPMCONFIGDIR@/rpmdeps {--provides|--requires}.
|
||||
-%__perl_provides @RPMCONFIGDIR@/perldeps.pl --provides
|
||||
-%__perl_requires @RPMCONFIGDIR@/perldeps.pl --requires
|
||||
-#%__perl_provides @RPMCONFIGDIR@/perl.prov
|
||||
-#%__perl_requires @RPMCONFIGDIR@/perl.req
|
||||
+#%__perl_provides @RPMCONFIGDIR@/perldeps.pl --provides
|
||||
+#%__perl_requires @RPMCONFIGDIR@/perldeps.pl --requires
|
||||
+%__perl_provides @RPMCONFIGDIR@/perl.prov
|
||||
+%__perl_requires @RPMCONFIGDIR@/perl.req
|
||||
|
||||
%__python_provides @RPMCONFIGDIR@/pythondeps.sh --provides
|
||||
%__python_requires @RPMCONFIGDIR@/pythondeps.sh --requires
|
||||
@@ -591,15 +593,15 @@ print (t)\
|
||||
@@ -606,15 +612,15 @@ print (t)\
|
||||
%_dbi_config_Packages %{_dbi_htconfig} lockdbfd
|
||||
|
||||
# "Depends" is a per-transaction cache of known dependency resolutions.
|
||||
@@ -112,99 +108,7 @@ Index: macros.in
|
||||
|
||||
# XXX legacy configuration.
|
||||
# Choose db interface:
|
||||
@@ -658,8 +660,8 @@ print (t)\
|
||||
|
||||
# Horowitz Key Protocol server configuration
|
||||
#
|
||||
-%_hkp_keyserver hkp://pgp.mit.edu
|
||||
-%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=0x
|
||||
+#%_hkp_keyserver hkp://pgp.mit.edu
|
||||
+#%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=0x
|
||||
|
||||
#==============================================================================
|
||||
# ---- Transaction macros.
|
||||
@@ -767,80 +769,6 @@ print (t)\
|
||||
#
|
||||
# XXX Note: that there cannot be any whitespace within the string "p>q",
|
||||
# and that both p and q are package names (i.e. no version/release).
|
||||
-#
|
||||
-#%_dependency_whiteout_5_2 \
|
||||
-# pam>pamconfig
|
||||
-#%_dependency_whiteout_6_1 \
|
||||
-# pilot-link-devel>pilot-link
|
||||
-#%_dependency_whiteout_6_2 \
|
||||
-# egcs-c++>libstdc++
|
||||
-%_dependency_whiteout_7_0 \
|
||||
- pango-gtkbeta-devel>pango-gtkbeta\
|
||||
- XFree86>Mesa \
|
||||
- compat-glibc>db2 \
|
||||
- compat-glibc>db1 \
|
||||
- pam>initscripts \
|
||||
- initscripts>sysklogd
|
||||
-%_dependency_whiteout_7_1 \
|
||||
- arts>kdelibs-sound
|
||||
-%_dependency_whiteout_7_2 \
|
||||
- libgnomeprint15>gnome-print \
|
||||
- nautilus>nautilus-mozilla \
|
||||
- tcl>postgresql-tcl
|
||||
-#%_dependency_whiteout_8_0 \
|
||||
-# perl>perl-Parse-RecDescent \
|
||||
-# XFree86-libs>XFree86-Mesa-libGL \
|
||||
-# perl>perl-Filter \
|
||||
-# perl>mrtg \
|
||||
-# perl>mod_perl \
|
||||
-# mysql>perl-DBD-MySQL \
|
||||
-# ghostscript>gimp-print \
|
||||
-# arts>kde2-compat \
|
||||
-# perl-Date-Calc>perl-Bit-Vector \
|
||||
-# glibc-debug>glibc-devel
|
||||
-
|
||||
-%_dependency_whiteout_8_0 \
|
||||
- mysql>perl-DBD-MySQL \
|
||||
- perl>perl-Filter \
|
||||
- perl>mrtg \
|
||||
- perl>mod_perl \
|
||||
- perl-Date-Calc>perl-Bit-Vector \
|
||||
-
|
||||
-%_dependency_whiteout_fc3 \
|
||||
- coreutils>pam \
|
||||
- nautilus>nautilus-cd-burner \
|
||||
- aspell>aspell-en \
|
||||
- kernel>initscripts \
|
||||
- kernel-smp>initscripts \
|
||||
- xorg-x11-libs>xorg-x11-Mesa-libGL \
|
||||
- openldap>cyrus-sasl-md5 \
|
||||
- openldap>cyrus-sasl \
|
||||
- openjade>docbook-dtds \
|
||||
- gtk+>gdk-pixbuf \
|
||||
- xorg-x11>xinitrc \
|
||||
- gnome-python2>gnome-python2-bonobo \
|
||||
- httpd-suexec>httpd \
|
||||
- xemacs-sumo>apel-xemacs \
|
||||
- php>php-pear \
|
||||
- openoffice.org-libs>openoffice.org
|
||||
-
|
||||
-%_dependency_whiteout \
|
||||
- libtermcap>bash \
|
||||
- modutils>vixie-cron \
|
||||
- ypbind>yp-tools \
|
||||
- ghostscript-fonts>ghostscript \
|
||||
- %{?_dependency_whiteout_fc3} \
|
||||
- %{?_dependency_whiteout_fc2} \
|
||||
- %{?_dependency_whiteout_fc1} \
|
||||
- %{?_dependency_whiteout_9} \
|
||||
- %{?_dependency_whiteout_8_0} \
|
||||
- %{?_dependency_whiteout_7_2} \
|
||||
- %{?_dependency_whiteout_7_1} \
|
||||
- %{?_dependency_whiteout_7_0} \
|
||||
- %{?_dependency_whiteout_6_2} \
|
||||
- %{?_dependency_whiteout_6_1} \
|
||||
- %{?_dependency_whiteout_5_2} \
|
||||
- %{nil}
|
||||
|
||||
#
|
||||
# Default headerSprintf() output format string for rpm -qa
|
||||
@@ -1093,7 +1021,7 @@ print (t)\
|
||||
@@ -1038,7 +1044,7 @@ print (t)\
|
||||
%_build_vendor %{_host_vendor}
|
||||
%_build_os %{_host_os}
|
||||
%_host @host@
|
||||
@@ -213,10 +117,10 @@ Index: macros.in
|
||||
%_host_cpu @host_cpu@
|
||||
%_host_vendor @host_vendor@
|
||||
%_host_os @host_os@
|
||||
@@ -1250,12 +1178,191 @@ done \
|
||||
@@ -1194,6 +1200,181 @@ done \
|
||||
%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib)
|
||||
%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
+# More useful perl macros (from Raul Dias <rsd@swi.com.br>)
|
||||
+#
|
||||
+%perl_version %(perl -V:version | sed "s!.*='!!;s!'.*!!")
|
||||
@@ -392,20 +296,22 @@ Index: macros.in
|
||||
+run "\\$@"\
|
||||
+EOF
|
||||
+
|
||||
+#------------------------------------------------------------------------------
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for all Intel i?86 compatibile processors
|
||||
# (Note: This macro (and it's analogues) will probably be obsoleted when
|
||||
# rpm can use regular expressions against target platforms in macro
|
||||
# conditionals.
|
||||
#
|
||||
%ix86 i386 i486 i586 i686 pentium3 pentium4 athlon
|
||||
+%arm armv4l armv4b armv5l armv5b armv5tel armv5teb
|
||||
+%arml armv4l armv5l armv5tel
|
||||
+%armb armv4b armv5b armv5teb
|
||||
@@ -1204,8 +1385,9 @@ done \
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
# Use in %install to generate locale specific file lists. For example,
|
||||
@@ -1270,3 +1377,17 @@ done \
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for all supported ARM processors
|
||||
-%arm armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l
|
||||
-
|
||||
+%arm armv3l armv4b armv4l armv4tl armv5b armv5l armv5teb armv5tel armv5tejl armv6l
|
||||
+%arml armv3l armv4l armv5l armv5tel armv6l
|
||||
+%armb armv4b armv5b armv5teb
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# arch macro for all supported Alpha processors
|
||||
@@ -1224,3 +1406,26 @@ done \
|
||||
|
||||
# \endverbatim
|
||||
#*/
|
||||
@@ -423,3 +329,12 @@ Index: macros.in
|
||||
+%info_del() test -x /sbin/install-info -a ! -f %{?2}%{?!2:%{_infodir}}/%{1}%ext_info && /sbin/install-info --quiet --delete --info-dir=%{?2}%{?!2:%{_infodir}} %{?2}%{?!2:%{_infodir}}/%{1}%ext_info \
|
||||
+%{nil}
|
||||
+
|
||||
+%service_add() %{fillup_and_insserv %{1}}
|
||||
+%service_del_preun() %{stop_on_removal %{1}}
|
||||
+%service_del_postun() %{restart_on_update %{1}}
|
||||
+
|
||||
+%user_group_add() \
|
||||
+/usr/sbin/groupadd -o -r %{1} 2>/dev/null || :\
|
||||
+/usr/sbin/useradd -o -r -g %{1} -d %{2} -s %{3} -c %{4} %{1} 2>/dev/null || :\
|
||||
+%{nil}
|
||||
+
|
||||
|
||||
Reference in New Issue
Block a user