Remove unnecessary Conflicts:
This commit is contained in:
parent
d7d790c83c
commit
85647fc486
1 changed files with 1 additions and 2 deletions
|
|
@ -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 <mmaslano@redhat.com> - 1.24.2-5
|
||||
- Mass rebuild with perl-5.12.0
|
||||
|
|
|
|||
Reference in a new issue