- update mkrel

- include rpm rpmrc in our rpmrc
- minor fixes

4 files changed, 14 insertions, 8 deletions

diff --git a/Makefile.am b/Makefile.am
index 76a28cc..1eea864 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,6 @@ install-data-local: $(macrosfiles)
 	  $(mkinstalldirs) $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS); \
 	  $(install_sh_DATA) $${i}.macros $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS)/macros; \
 	done
-	echo 	$(pkg_data_in)
    
 .PHONY: rpm
 rpm: dist
diff --git a/Makefile.in b/Makefile.in
index f103ecb..4004e2b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -516,7 +516,6 @@ install-data-local: $(macrosfiles)
 	  $(mkinstalldirs) $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS); \
 	  $(install_sh_DATA) $${i}.macros $(DESTDIR)$(RPMVENDORDIR)/$${i}-$(RPMOS)/macros; \
 	done
-	echo 	$(pkg_data_in)
 
 .PHONY: rpm
 rpm: dist
diff --git a/macros.in b/macros.in
index aa48dd2..1e1f78f 100644
--- a/macros.in
+++ b/macros.in
@@ -9,10 +9,10 @@
 # should be added to /etc/rpm/macros, while per-user configuration should
 # be added to ~/.rpmmacros.
 
-%_host_vendor Mandriva
-%_real_vendor Mandriva
+%_host_vendor @RPMVENDOR@
+%_real_vendor @RPMVENDOR@
 
-%_vendor Mandriva
+%_vendor @RPMVENDOR@
 
 %_target_platform	%{_target_cpu}-%{_real_vendor}-%{_target_os}%{?_gnu}
 
@@ -30,6 +30,9 @@
 
 %__gzip			/usr/bin/gzip
 
+%_sys_macros_dir @RPMSYSCONFDIR@/macros.d
+%build_sysmacrospath() %{_sys_macros_dir}/%{1}.macros
+
 #==============================================================================
 # ---- Build system path macros.
 #
@@ -49,7 +52,7 @@
 #	(e.g. per-platform, per-system, per-packager, per-package) macros.
 #
 
-%_enable_debug_packages 0
+# %_enable_debug_packages
 
 %debugcflags %{?_enable_debug_packages:-g}
 
@@ -186,7 +189,9 @@
 # (user may copy the following line in specfile)
 %mdkversion		%(perl -pe '/(\\d+)\\.(\\d)\\.?(\\d)?/; $_="$1$2".($3||0)' /etc/mandrake-release)
 
-%mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.*)(\\d+)$/;$rel=$2-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}
+%distsuffix mdk
+
+%mkrel(c:) %{-c: 0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*\\D\+)?(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}
 
 %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
 	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
diff --git a/rpmrc.in b/rpmrc.in
index 7f93158..8e651d1 100644
--- a/rpmrc.in
+++ b/rpmrc.in
@@ -2,6 +2,9 @@
 #
 # @RPMVENDORDIR@/rpmrc
 
+# Getting default rpm configuration
+include: @RPMLIBDIR@/rpmrc
+
 #############################################################
 # Values for RPM_OPT_FLAGS for various platforms
 
@@ -92,4 +95,4 @@ arch_compat: osfmach3_i386: i486
 
 buildarch_compat: k6: i486
 
-macrofiles: @RPMLIBDIR@/macros:@RPMLIBDIR@/%{target}/macros:@RPMVENDORDIR@/macros:@RPMVENDORDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros:@RPMSYSCONFDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros.d/*.macros:~/.rpmmacros
+macrofiles: @RPMLIBDIR@/macros:@RPMLIBDIR@/%{_target}/macros:@RPMVENDORDIR@/macros:@RPMVENDORDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros:@RPMSYSCONFDIR@/%{_target}/macros:@RPMSYSCONFDIR@/macros.d/*.macros:~/.rpmmacros