summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-11-22 10:28:33 +0100
committerRemi Collet <remi@remirepo.net>2018-11-22 10:28:33 +0100
commitcba50b679ef93ae33acd2c5870b753532c6f814d (patch)
treee0e3225c8f20fcc5fbf7b49143bbab6c2d16632d
parent7bafaebdc9c075c3ec60b13d556b4ee1dbbfcc60 (diff)
fix conflicts
-rw-r--r--php-doctrine-event-manager.spec7
1 files changed, 5 insertions, 2 deletions
diff --git a/php-doctrine-event-manager.spec b/php-doctrine-event-manager.spec
index 37d0dc5..fb0969c 100644
--- a/php-doctrine-event-manager.spec
+++ b/php-doctrine-event-manager.spec
@@ -27,7 +27,7 @@
Name: php-%{pk_vendor}-%{pk_project}
Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple PHP event system
Group: Development/Libraries
@@ -52,7 +52,7 @@ Requires: php-composer(fedora/autoloader)
Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version}
# Split off doctrine/common
-Conflicts: php-doctrine-common < 2.9
+Conflicts: php-doctrine-common < 1:2.9
%description
@@ -117,5 +117,8 @@ exit $ret
%changelog
+* Thu Nov 22 2018 Remi Collet <remi@remirepo.net> - 1.0.0-2
+- fix conflicts
+
* Thu Oct 18 2018 Remi Collet <remi@remirepo.net> - 1.0.0-1
- initial package, version 1.0.0