packages: NetworkManager/NetworkManager.spec - added BuildConflict: libnl1-...
sls
sls at pld-linux.org
Sat Oct 15 01:00:37 CEST 2011
Author: sls Date: Fri Oct 14 23:00:37 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- added BuildConflict: libnl1-devel
---- Files affected:
packages/NetworkManager:
NetworkManager.spec (1.92 -> 1.93)
---- Diffs:
================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.92 packages/NetworkManager/NetworkManager.spec:1.93
--- packages/NetworkManager/NetworkManager.spec:1.92 Thu Sep 29 19:39:52 2011
+++ packages/NetworkManager/NetworkManager.spec Sat Oct 15 01:00:32 2011
@@ -48,6 +48,7 @@
BuildRequires: udev-glib-devel >= 147
%{?with_wimax:BuildRequires: wimax-devel >= 1.5.1}
BuildRequires: xz
+BuildConflicts: libnl1-devel
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: ConsoleKit-x11
@@ -290,6 +291,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.93 2011/10/14 23:00:32 sls
+- added BuildConflict: libnl1-devel
+
Revision 1.92 2011/09/29 17:39:52 wiget
- merge from DEVEL
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.92&r2=1.93&f=u
More information about the pld-cvs-commit
mailing list