aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Thauvin <nanardon@mandriva.org>2005-05-31 02:16:15 +0000
committerOlivier Thauvin <nanardon@mandriva.org>2005-05-31 02:16:15 +0000
commit281c8277a7b639baa22f5c42d38427c6d2cf1a63 (patch)
tree1f1fc880776916355e16c1eaf6d00eb1b0e1fa98
parentf7ee1539e4d3a4151b6b3f7b3a3ff774a0c142c8 (diff)
downloadrpm-setup-281c8277a7b639baa22f5c42d38427c6d2cf1a63.tar
rpm-setup-281c8277a7b639baa22f5c42d38427c6d2cf1a63.tar.gz
rpm-setup-281c8277a7b639baa22f5c42d38427c6d2cf1a63.tar.bz2
rpm-setup-281c8277a7b639baa22f5c42d38427c6d2cf1a63.tar.xz
rpm-setup-281c8277a7b639baa22f5c42d38427c6d2cf1a63.zip
- add %_logdir
- add some macro from conectiva
-rw-r--r--macros.in9
1 files changed, 8 insertions, 1 deletions
diff --git a/macros.in b/macros.in
index 496f2c8..6af84d8 100644
--- a/macros.in
+++ b/macros.in
@@ -73,7 +73,8 @@
%_multilibpatt (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
%_sysconfdir /etc
-%_localstatedir %_var/lib
+%_localstatedir %{_var}/lib
+%_logdir %{_var}/log
%_infodir /usr/share/info
%_mandir /usr/share/man
@@ -484,3 +485,9 @@
%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
+#--------------------------------------------------------------------------------
+# Macro from conectiva
+
+%rename() \
+Obsoletes: %{1} <= %{version}-%{release} \
+Provides: %{1} = %{version}-%{release}