From 0c6270142b05042cd9803aadc603498286cfaf5459121601080b7805276ce6a1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 19 Jan 2008 16:15:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=30 --- rpm-python.spec | 2 +- rpm-suse_macros | 66 +++++++++++++++++++++++++++++++++++-------------- rpm.changes | 5 ++++ rpm.spec | 8 +++--- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/rpm-python.spec b/rpm-python.spec index 00a2849..95f874b 100644 --- a/rpm-python.spec +++ b/rpm-python.spec @@ -16,7 +16,7 @@ License: GPL v2 or later Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 194 +Release: 196 Requires: rpm = %{version} %py_requires Source99: rpm.spec diff --git a/rpm-suse_macros b/rpm-suse_macros index b72bf40..2d95b58 100644 --- a/rpm-suse_macros +++ b/rpm-suse_macros @@ -14,16 +14,21 @@ %_defaultdocdir %{_usr}/share/doc/packages # package build macros -%makeinstall make DESTDIR=%{buildroot} install +%makeinstall make DESTDIR=%{?buildroot:%{buildroot}} install %tcl_version %(echo 'puts [package require Tcl]' | tclsh) -%insserv_prereq insserv -%fillup_prereq fillup fileutils +%tclscriptdir %_datadir/tcl +%rb_arch %(echo %{_host_cpu}-linux | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/") +%rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, "")') +%insserv_prereq insserv sed +%fillup_prereq fillup coreutils grep diffutils +%suseconfig_fonts_prereq perl aaa_base %install_info_prereq info -%__os_install_post \ +%__os_install_post %{?_suse_os_install_post}%{!?_suse_os_install_post: \ %{suse_check} \ /usr/lib/rpm/brp-compress \ -%{nil} + /usr/lib/rpm/brp-symlink \ +%{nil}} # perl_vendorarch is defined # perl_vendorlib is defined @@ -40,8 +45,8 @@ # macro: %suse_update_desktop_file # Used to add easily a category to .desktop files according to XDG # standard. -%suse_update_desktop_file(:-:) \ - /usr/lib/rpm/suse_update_desktop_file.sh %{**} || exit 1 \ +%suse_update_desktop_file(cinrud:D:N:C:G:) \ + /usr/lib/rpm/suse_update_desktop_file.sh %{**} || exit 1 \ %nil # macro: %restart_on_update() @@ -102,12 +107,32 @@ if test -x /sbin/SuSEconfig -a -f /sbin/conf.d/SuSEconfig.%{-m*} ; then \ /sbin/SuSEconfig --module %{-m*} \ else \ - echo -e "\\nERROR: SuSEconfig or requested SuSEconfig module not present!\\n" ; exit 1 \ + echo -e "\\nWARNING: SuSEconfig or requested SuSEconfig module not present!\\n" ; \ fi \ fi \ %nil -%verify_permissions(:-:) \ +# macro: run_suseconfig_fonts +# call SuSEconfig modules necessary for font setup +# options: +# -c (the fonts are CJK fonts, also do setup which is only needed +# for CJK) +%run_suseconfig_fonts(c) \ + if test -z "$YAST_IS_RUNNING" ; then \ + if test -x /sbin/conf.d/SuSEconfig.fonts ; then \ + %run_suseconfig -m fonts \ + fi \ + if test -x /sbin/conf.d/SuSEconfig.pango ; then \ + %run_suseconfig -m pango \ + fi \ + %{-c:if test -x /sbin/conf.d/SuSEconfig.ghostscript-cjk ; then \ + %run_suseconfig -m ghostscript-cjk \ + fi} \ + fi \ + %nil + + +%verify_permissions(e:f:) \ if test -f /etc/sysconfig/security ; then \ source /etc/sysconfig/security \ fi \ @@ -119,6 +144,7 @@ done \ /usr/bin/chkstat -n %{**} $PERMFILES 1>&2 \ %nil + # %{suse_update_config [-fcl] [dirs...]} # -f: force, ignore timestamp # -c: no config.guess,config.sub @@ -223,7 +249,8 @@ echo -e "#\\n# Start service $SCRIPTNAME\\n#\\n$STARTVAR=\\"${!STARTVAR}\\"\\n\\n" >> var/adm/fillup-templates/rc.config.$PNAME.del } } \ done \ %{!-f: %{do_real_fillup}} \ - %{!-i: %{add_start_if_needed $INSSRV_ARRAY } } + %{!-i: %{add_start_if_needed $INSSRV_ARRAY } } \ + %nil # do_real_fillup: internal macro # this part really calls fillup for the appropriate files @@ -258,7 +285,7 @@ fi \ else \ echo "ERROR: fillup not found. This should not happen. Please compare" \ - echo "etc/rc.config and $TEMPLATE_DIR/rc.config.$PNAME and" \ + echo "etc/sysconfig/$PNAME and $TEMPLATE_DIR/sysconfig.$PNAME and" \ echo "update by hand." \ fi @@ -320,9 +347,10 @@ %{rc_fillup} \ else \ echo "ERROR: fillup not found. This should not happen. Please compare" \ - echo "etc/rc.config and $RC_TEMPLATE and" \ + echo "etc/sysconfig/$SD_NAME$PNAME and $SYSC_TEMPLATE and" \ echo "update by hand." \ - fi + fi \ + %nil # internal only: rc_fillup %rc_fillup() \ @@ -445,19 +473,18 @@ fi ; \ fi ; -%suse_version 901 +# find-supplements.ksyms parses this macro directly out of the spec file: +%supplements_kernel_module() \ + %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)} + +%suse_version 1031 %sles_version 0 %ul_version 0 - %do_profiling 1 %cflags_profile_generate -fprofile-generate %cflags_profile_feedback -fprofile-use -# find-supplements.ksyms parses this macro directly out of the spec file: -%supplements_kernel_module() \ - %{expand:%(if ! rpm -q kernel-syms > /dev/null; then echo "%fail Please add the kernel-syms package to BuildRequires"; fi)} - # Template for lang sub-package. %lang_package(n:) \ %package %{-n:-n %{-n*}-}lang \ @@ -468,3 +495,4 @@ Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \ Supplements: packageand(bundle-lang-other:%{-n:%{-n*}}%{!-n:%{name}}) \ %description %{-n:-n %{-n*}-}lang \ Provides translations to the package %{name} + diff --git a/rpm.changes b/rpm.changes index ea455a9..48c3824 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 19 17:14:55 CET 2008 - mls@suse.de + +- update rpm-suse_macros so that the build service can build, too + ------------------------------------------------------------------- Thu Jan 17 19:19:09 CET 2008 - wberrier@suse.de diff --git a/rpm.spec b/rpm.spec index 78273dd..b56464d 100644 --- a/rpm.spec +++ b/rpm.spec @@ -20,7 +20,7 @@ PreReq: %insserv_prereq %fillup_prereq permissions AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 157 +Release: 159 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -345,7 +345,7 @@ Summary: A C library for parsing command line parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 385 +Release: 387 # %description -n popt @@ -368,7 +368,7 @@ Summary: C Library for Parsing Command Line Parameters License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 385 +Release: 387 Requires: popt = 1.7 Requires: glibc-devel @@ -403,6 +403,8 @@ Authors: %doc %{_mandir}/man3/popt.3* %changelog +* Sat Jan 19 2008 mls@suse.de +- update rpm-suse_macros so that the build service can build, too * Thu Jan 17 2008 wberrier@suse.de - autodeps.diff pass .config files to mono-find-requires, not mono-find-provides