rpms/ldns/devel ldns-installfix-r3167.patch, NONE, 1.1 ldns-rpathfix.patch, NONE, 1.1 ldns.spec, 1.54, 1.55

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7468

Modified Files:
	ldns.spec 
Added Files:
	ldns-installfix-r3167.patch ldns-rpathfix.patch 
Log Message:
* Fri Jan 22 2010 Paul Wouters <paul at xelerance.com> - 1.6.4-2
- Fix missing _ldns.so causing ldns-python to not work
- Patch for installing ldns-python files
- Patch for rpath in ldns-python
- Don't install .a file for ldns-python


ldns-installfix-r3167.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ldns-installfix-r3167.patch ---
--- Makefile.in.org	2010-01-22 11:09:15.671232722 -0500
+++ Makefile.in	2010-01-22 11:10:08.346392415 -0500
@@ -203,8 +203,8 @@
 
 install-pyldns: @PYLDNS@
 		$(INSTALL) -m 755 -d $(DESTDIR)$(python_site)/ldns
-		$(INSTALL) -c -m 644 $(pywrapdir)/ldns.py $(DESTDIR)$(python_site)/ldns/__init__.py
-		$(INSTALL) -c -m 755 _ldns.* $(DESTDIR)$(python_site)/ldns/
+		$(INSTALL) -c -m 644 $(pywrapdir)/ldns.py $(DESTDIR)$(python_site)/ldns.py
+		$(LIBTOOL) --mode=install cp _ldns.la $(DESTDIR)$(python_site)
 
 uninstall-pyldns:	
 		rm -f $(DESTDIR)$(python_site)/ldns/*

ldns-rpathfix.patch:
 configure.ac |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

--- NEW FILE ldns-rpathfix.patch ---
Index: configure.ac
===================================================================
--- configure.ac	(revision 3167)
+++ configure.ac	(working copy)
@@ -163,16 +163,8 @@
 fi
 AC_SUBST(INSTALL_LDNS_CONFIG)
 
-# add option to disable the evil rpath
-dnl Check whether to use rpath or not
-AC_ARG_ENABLE(rpath,
-        [  --disable-rpath                disable hardcoded rpath (default=enabled)],
-	enable_rpath=$enableval, enable_rpath=yes)
+ACX_ARG_RPATH
 
-if test "x$enable_rpath" = xyes; then
-    RPATH_VAL="-Wl,-rpath=\${libdir}"
-fi
-
 #AC_TRY_RUN(
 #[
 #int main()



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- ldns.spec	20 Jan 2010 16:32:49 -0000	1.54
+++ ldns.spec	22 Jan 2010 16:50:31 -0000	1.55
@@ -8,7 +8,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -16,6 +16,8 @@ Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, autoconf, automake, gcc-c++, doxygen,
 BuildRequires: perl, libpcap-devel, openssl-devel
+Patch1: ldns-installfix-r3167.patch
+Patch2: ldns-rpathfix.patch
 
 %if %{with_python}
 BuildRequires:  python-devel, swig
@@ -39,7 +41,7 @@ The devel package contains the ldns libr
 %package python
 Summary: Python extensions for ldns
 Group: Applications/System
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description python
 Python extensions for ldns
@@ -48,19 +50,22 @@ Python extensions for ldns
 
 %prep
 %setup -q 
+%patch1
+%patch2
 # To built svn snapshots
-#rm config.guess config.sub ltmain.sh
-#libtoolize
-#autoreconf
+rm config.guess config.sub ltmain.sh
+aclocal
+libtoolize -c --install
+autoreconf --install
 
 %build
-%configure --disable-rpath --with-sha2 \
+%configure --disable-rpath --disable-static --with-sha2 \
 %if %{with_python}
  --with-pyldns
 %endif
 
-(cd drill ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
-(cd examples ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/ )
+(cd drill ; %configure --disable-rpath --disable-static --with-ldns=%{buildroot}/lib/ )
+(cd examples ; %configure --disable-rpath --disable-static --with-ldns=%{buildroot}/lib/ )
 
 make %{?_smp_mflags} 
 ( cd drill ; make %{?_smp_mflags} )
@@ -75,7 +80,7 @@ make DESTDIR=%{buildroot} INSTALL="%{__i
 
 %if %{with_python}
 # remove execute perms from python files
-chmod a-x %{buildroot}%{python_sitelib}/ldns/*py
+chmod a-x %{buildroot}%{python_sitelib}/*py
 %endif
 
 # don't package building script in doc
@@ -107,7 +112,6 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libldns.a
 %{_libdir}/libldns*so
 %{_bindir}/ldns-config
 %dir %{_includedir}/ldns
@@ -125,6 +129,12 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jan 22 2010 Paul Wouters <paul at xelerance.com> - 1.6.4-2
+- Fix missing _ldns.so causing ldns-python to not work
+- Patch for installing ldns-python files
+- Patch for rpath in ldns-python
+- Don't install .a file for ldns-python
+
 * Wed Jan 20 2010 Paul Wouters <paul at xelerance.com> - 1.6.4-1
 - Upgraded to 1.6.4. 
 - Added ldns-python sub package