SPECS: pdns.spec - pl fixes - more general _lib sed - reordered configure o...

[qboosh]

Author: qboosh                       Date: Wed Oct  8 19:04:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- pl fixes
- more general _lib sed
- reordered configure options

---- Files affected:
SPECS:
   pdns.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/pdns.spec
diff -u SPECS/pdns.spec:1.68 SPECS/pdns.spec:1.69
--- SPECS/pdns.spec:1.68	Mon Oct  6 18:54:51 2008
+++ SPECS/pdns.spec	Wed Oct  8 21:04:11 2008
@@ -58,7 +58,7 @@
 
 %package backend-pipe
 Summary:	PowerDNS support for custom pipe backend
-Summary(pl.UTF-8):	Wsparcie PowerDNS dla własnego mechanizmu przechowywania stref
+Summary(pl.UTF-8):	Obsługa własnego mechanizmu przechowywania stref dla PowerDNS-a
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -74,7 +74,7 @@
 
 %package backend-gpgsql
 Summary:	PowerDNS support for PostgreSQL
-Summary(pl.UTF-8):	Wsparcie PowerDNS dla baz PostgresQL
+Summary(pl.UTF-8):	Obsługa baz PostgreSQL dla PowerDNS-a
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -87,7 +87,7 @@
 
 %package backend-gmysql
 Summary:	PowerDNS support for MySQL
-Summary(pl.UTF-8):	Wsparcie PowerDNS dla baz MySQL
+Summary(pl.UTF-8):	Obsługa baz MySQL dla PowerDNS-a
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -99,21 +99,21 @@
 relacyjnej bazy danych MySQL.
 
 %package backend-gsqlite3
-Summary:	PowerDNS support for Sqlite3
-Summary(pl.UTF-8):	Wsparcie PowerDNS dla baz Sqlite3
+Summary:	PowerDNS support for SQLite 3
+Summary(pl.UTF-8):	Obsługa baz SQLite 3 dla PowerDNS-a
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description backend-gsqlite3
-This package allows zone storage in Sqlite3 relational db tables.
+This package allows zone storage in SQLite 3 relational db tables.
 
 %description backend-gsqlite3 -l pl.UTF-8
 Ten pakiet pozwala na przechowywanie danych o strefach w tabelach
-relacyjnej bazy danych Sqlite3.
+relacyjnej bazy danych SQLite 3.
 
 %package backend-ldap
 Summary:	PowerDNS support for LDAP
-Summary(pl.UTF-8):	Wsparcie PowerDNS dla baz LDAP
+Summary(pl.UTF-8):	Obsługa LDAP dla PowerDNS-a
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 
@@ -135,8 +135,8 @@
 cp %{SOURCE2} .
 cp %{SOURCE4} .
 
-%if "%{_lib}" == "lib64"
-%{__sed} -i -e 's/module-dir=\/usr\/lib\/pdns/module-dir=\/usr\/lib64\/pdns/' pdns.conf
+%if "%{_lib}" != "lib"
+%{__sed} -i -e 's/module-dir=\/usr\/lib\/pdns/module-dir=\/usr\/%{_lib}\/pdns/' pdns.conf
 %endif
 
 %build
@@ -144,20 +144,20 @@
 %configure \
 	--libdir=%{_libdir}/%{name} \
 	--sysconfdir=%{_sysconfdir}/%{name} \
-	--with-socketdir=/var/run \
-	--with-dynmodules="gsqlite3 gmysql gpgsql pipe ldap" \
-	--with-modules="" \
+	--disable-static \
+	--enable-ldap \
 	--enable-mysql \
 	--enable-pgsql \
 	--enable-sqlite3 \
-	--with-pgsql-lib=%{_libdir} \
 	--with-pgsql-includes=%{_includedir} \
-	--with-mysql-lib=%{_libdir} \
+	--with-pgsql-lib=%{_libdir} \
 	--with-mysql-includes=%{_includedir} \
-	--with-sqlite3-lib=%{_libdir} \
+	--with-mysql-lib=%{_libdir} \
 	--with-sqlite3-includes=%{_includedir} \
-	--enable-ldap \
-	--disable-static
+	--with-sqlite3-lib=%{_libdir} \
+	--with-dynmodules="gsqlite3 gmysql gpgsql pipe ldap" \
+	--with-modules="" \
+	--with-socketdir=/var/run
 
 %{__make}
 
@@ -239,6 +239,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2008/10/08 19:04:11  qboosh
+- pl fixes
+- more general _lib sed
+- reordered configure options
+
 Revision 1.68  2008/10/06 16:54:51  aredridel
 - fixes compatibility with later boost and later stdlib
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pdns.spec?r1=1.68&r2=1.69&f=u