Title: [opsview] [10785] Use Obsoletes instead of Conflicts.
- Revision
- 10785
- Author
- pknight
- Date
- 2012-11-09 13:43:07 +0000 (Fri, 09 Nov 2012)
Log Message
Use Obsoletes instead of Conflicts.
Modified Paths
Modified: trunk/auth-tkt/mod_auth_tkt.spec
===================================================================
--- trunk/auth-tkt/mod_auth_tkt.spec 2012-11-09 12:40:49 UTC (rev 10784)
+++ trunk/auth-tkt/mod_auth_tkt.spec 2012-11-09 13:43:07 UTC (rev 10785)
@@ -3,7 +3,7 @@
%define httpd apache2
%else
%define httpd httpd
-%endif
+%endif
%define name mod_auth_tkt
%{?apache:%define httpd apache}
%{?apache:%define name mod_auth_tkt1}
@@ -23,8 +23,7 @@
Buildroot: %_tmppath/%{name}_opsview-%{version}
Requires: %{httpd}
BuildRequires: %{httpd}-devel
-# Add Conflicts in case user already has this package
-Conflicts: mod_auth_tkt
+Obsoletes: mod_auth_tkt
%description
mod_auth_tkt provides lightweight, repository-agnostic, ticket-based
@@ -78,7 +77,7 @@
# relatively, which doesn't seem to be the case for SLES
perl -i -pe 's!^LoadModule\s+auth_tkt_module\s+(.*)$!LoadModule auth_tkt_module %{_libdir}/%{httpd}/modules/mod_auth_tkt.so!' $RPM_BUILD_ROOT%{_sysconfdir}/%{httpd}/conf.d/02_auth_tkt.conf
cat $RPM_BUILD_ROOT%{_sysconfdir}/%{httpd}/conf.d/02_auth_tkt.conf
-%endif
+%endif
cp -pr contrib/* $RPM_BUILD_ROOT/usr/share/doc/%{name}_opsview-%{version}/contrib
rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}_opsview-%{version}/contrib/t
cp -pr README* INSTALL LICENSE ChangeLog CREDITS $RPM_BUILD_ROOT/usr/share/doc/%{name}_opsview-%{version}
_______________________________________________
Opsview-checkins mailing list
[email protected]
http://lists.opsview.org/lists/listinfo/opsview-checkins
