[ptouch-driver] use Requires insted of Conflicts

Jiří Popelka jpopelka at fedoraproject.org
Wed Jan 19 12:25:18 UTC 2011


commit e450468f24e18e91b8404e6fa3188341761c8df2
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Wed Jan 19 13:25:05 2011 +0100

    use Requires insted of Conflicts

 ptouch-driver.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ptouch-driver.spec b/ptouch-driver.spec
index 1c6a3ff..cabd33b 100644
--- a/ptouch-driver.spec
+++ b/ptouch-driver.spec
@@ -1,6 +1,6 @@
 Name:           ptouch-driver
 Version:        1.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CUPS driver for Brother P-touch label printers
 
 Group:          System Environment/Libraries
@@ -23,8 +23,7 @@ Summary:        Foomatic database data for Brother P-touch label printers
 Group:          System Environment/Libraries
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
-Requires:       foomatic-db
-Conflicts:      foomatic-db < 4.0-25.20101123
+Requires:       foomatic-db >= 4.0-25.20101123.fc15
 
 %description    foomatic
 This package contains foomatic database XML entries to generate PPDs
@@ -60,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datarootdir}/foomatic/db/source/opt/Brother-Ptouch-*.xml
 
 %changelog
+* Wed Jan 19 2011 Jiri Popelka <jpopelka at redhat.com> - 1.3-5
+- use Requires insted of Conflicts
+
 * Wed Jan 19 2011 Jiri Popelka <jpopelka at redhat.com> - 1.3-4
 - foomatic sub-package conflicts with foomatic-db < 4.0-25.20101123
 


More information about the scm-commits mailing list