1.74: remove macros needed for Manbo packages (they are now in rpm-manbo-setup)1.74

3 files changed, 1 insertions, 102 deletions

diff --git a/build.macros.in b/build.macros.in
index c4cfae9..b3a863d 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -28,8 +28,6 @@
 #	(e.g. per-platform, per-system, per-packager, per-package) macros.
 #
 
-%_enable_debug_packages 1
-
 %debugcflags %{?_enable_debug_packages:-g}
 
 %debug_package_and_restore %{debug_package} \
@@ -60,9 +58,6 @@ Group: %{group}\
 %_gamesbindir   %{_prefix}/%{_gamesdir}
 %_gamesdatadir  %{_datadir}/%{_gamesdir}
 
-#	Default extension to use.
-%_extension		.lzma
-
 # Menu directories
 %_menudir %{_prefix}/lib/menu
 %_iconsdir %{_datadir}/icons
@@ -98,12 +93,6 @@ Group: %{group}\
 
 %find_lang  @RPMVENDORDIR@/find-lang.pl %{buildroot}
 
-# Macro: %{mklibname <name> [<major> [<minor>]] [-s] [-d]}
-# - %{mklibname test}               => lib64test, on a lib64 platform
-# - %{mklibname test 1 -d}      => libtest1-devel
-# - %{mklibname test 1 -d 0 -s} => libtest1_0-static-devel
-%mklibname(ds)  %{_lib}%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}
-
 # Update Menu
 %_update_menus_bin %{_bindir}/update-menus
 %update_menus if [ -x %{_update_menus_bin} ]; then %{_update_menus_bin} || true ; fi \
@@ -118,14 +107,6 @@ Group: %{group}\
 %make_session if [ -x %{_fndsession_bin} ]; then %{_fndsession_bin} || true ; fi \
 %{nil}
 
-#	Macros to install info-files.
-%_install_info()	if [[ -f %{_infodir}/%{1}%{_extension} ]];then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir;fi \
-%{nil}
-
-#	Macros to remove info-files. (keep the "alone on its line ';'")
-%_remove_install_info() if [ "$1" = "0" ]; then if [[ -f %{_infodir}/%{1}%{_extension} ]];then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir --remove ;fi; fi \
-%{nil}
-
 # For rebuilding gcj-db
 %_rebuildgcjdb_bin %{_bindir}/rebuild-gcj-db
 %update_gcjdb if [ -x %{_rebuildgcjdb_bin} ]; then %{_rebuildgcjdb_bin} || true ; fi \
@@ -198,14 +179,6 @@ then %{_scrollkeeper_bin} -q || true ; fi \
 
 %mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:mdv}%{?mandriva_release:%mandriva_release}
 
-%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
-	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
-	[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-
-# make
-%_make_bin make
-%make %{_make_bin} %_smp_mflags
-
 #==============================================================================
 # ---- Build policy macros.
 #
@@ -228,68 +201,8 @@ then %{_scrollkeeper_bin} -q || true ; fi \
 #	(Note: Above is the goal, below are the macros under development)
 #
 
-# Servers opt flags.
-# Also set the env variables for backward compatibility (#32050).
-%serverbuild %define _serverbuild_flags -fstack-protector-all \
-export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%optflags" \
-%{nil}
-
 %__libtoolize_configure %{?__libtoolize:(cd $CONFIGURE_TOP; [ -f configure.in -o -f configure.ac ] && %{__libtoolize} --copy --force)}
 
-# This is an improved version of %configure (from PLD team).
-%configure \
-  CONFIGURE_TOP="${CONFIGURE_TOP:-.}"; \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  %{?__cputoolize:%{__cputoolize} -c $CONFIGURE_TOP} ; \
-  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
-  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
-  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
-  $CONFIGURE_TOP/configure %{_target_platform} \\\
-	--program-prefix=%{?_program_prefix} \\\
- 	--prefix=%{_prefix} \\\
-	--exec-prefix=%{_exec_prefix} \\\
-	--bindir=%{_bindir} \\\
-	--sbindir=%{_sbindir} \\\
-	--sysconfdir=%{_sysconfdir} \\\
-	--datadir=%{_datadir} \\\
-	--includedir=%{_includedir} \\\
-	--libdir=%{_libdir} \\\
-	--libexecdir=%{_libexecdir} \\\
-	--localstatedir=%{_localstatedir} \\\
-	--sharedstatedir=%{_sharedstatedir} \\\
-	--mandir=%{_mandir} \\\
-	--infodir=%{_infodir} \\\
-    $CONFIGURE_XPATH
-
-%configure2_5x \
-  CONFIGURE_TOP="${CONFIGURE_TOP:-.}"; \
-  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
-  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
-  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-  %{?__cputoolize:%{__cputoolize} -c $CONFIGURE_TOP} ; \
-  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
-  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
-  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
-  $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
- 	--prefix=%{_prefix} \\\
-	--exec-prefix=%{_exec_prefix} \\\
-	--bindir=%{_bindir} \\\
-	--sbindir=%{_sbindir} \\\
-	--sysconfdir=%{_sysconfdir} \\\
-	--datadir=%{_datadir} \\\
-	--includedir=%{_includedir} \\\
-	--libdir=%{_libdir} \\\
-	--libexecdir=%{_libexecdir} \\\
-	--localstatedir=%{_localstatedir} \\\
-	--sharedstatedir=%{_sharedstatedir} \\\
-	--mandir=%{_mandir} \\\
-	--infodir=%{_infodir} \\\
-    $CONFIGURE_XPATH
-
-%makeinstall_std make DESTDIR=%{?buildroot:%{buildroot}} install
-
 %old_makeinstall \
     make \\\
 	prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
diff --git a/configure.ac b/configure.ac
index 5dbae87..6603508 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 # $Id$
 
 AC_PREREQ(2.59)
-AC_INIT(rpm-mandriva-setup, 1.73, nanardon@mandriva.org)
+AC_INIT(rpm-mandriva-setup, 1.74, nanardon@mandriva.org)
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE(1.9)
 AC_CONFIG_SRCDIR
diff --git a/macros.in b/macros.in
index 61b11f6..4a9e99b 100644
--- a/macros.in
+++ b/macros.in
@@ -21,20 +21,6 @@
 
 %_changelog_truncate	3 years ago
 
-%_sysconfdir    /etc
-%_localstatedir %{_var}/lib
-%_logdir %{_var}/log
-
-%_infodir		/usr/share/info
-%_mandir		%_datadir/man
-%_initrddir		%{_sysconfdir}/rc.d/init.d
-
-%_defaultdocdir %{_usr}/share/doc
-
-%_docdir_fmt %%{NAME}
-
-%_libexecdir %_libdir
-
 
 #==============================================================================
 # ---- GPG/PGP/PGP5 signature macros.