From 85647fc4867eca5a1dc855438cfce6d41aa97cc2 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Sat, 22 Jan 2011 00:26:06 -0600 Subject: [PATCH] Remove unnecessary Conflicts: --- zoneminder.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zoneminder.spec b/zoneminder.spec index cee9bfb..ba8ca42 100644 --- a/zoneminder.spec +++ b/zoneminder.spec @@ -26,8 +26,6 @@ Patch4: zoneminder-1.24.1-perldep.patch Patch10: zoneminder-1.22.3-installfix.patch Patch11: zoneminder-1.24.2-gcc44.patch -Conflicts: zm <= 1.22.3 - BuildRequires: automake gnutls-devel BuildRequires: mysql-devel pcre-devel libjpeg-devel BuildRequires: perl(Archive::Tar) perl(Archive::Zip) @@ -199,6 +197,7 @@ fi - Unbundle mootools; instead link to the separately pacakged copy. - Remove BuildRoot:, %%clean and buildroot cleaning in %%install. - Git rid of mixed space/tab usage by removing all tabs. +- Remove unnecessary Conflicts: line. * Wed Jun 02 2010 Marcela Maslanova - 1.24.2-5 - Mass rebuild with perl-5.12.0