SPECS: nut.spec - datadir.patch conflict with ./configure --datadi...

[sls]

Author: sls                          Date: Wed Jul 25 17:36:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- datadir.patch conflict with ./configure --datadir
- rel. 0.3

---- Files affected:
SPECS:
   nut.spec (1.124 -> 1.125) 

---- Diffs:

================================================================
Index: SPECS/nut.spec
diff -u SPECS/nut.spec:1.124 SPECS/nut.spec:1.125
--- SPECS/nut.spec:1.124	Wed Jul 25 19:09:27 2007
+++ SPECS/nut.spec	Wed Jul 25 19:36:16 2007
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Sieciowe narzędzie do UPS-ów
 Name:		nut
 Version:	2.2.0
-Release:	0.1
+Release:	0.3
 License:	GPL
 Group:		Applications/System
 Source0:	http://eu1.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
@@ -163,7 +163,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
@@ -417,6 +417,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.125  2007/07/25 17:36:16  sls
+- datadir.patch conflict with ./configure --datadir
+- rel. 0.3
+
 Revision 1.124  2007/07/25 17:09:27  sls
 - updated and aplied client.patch
 - _datadir packaged again
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nut.spec?r1=1.124&r2=1.125&f=u