rpms/ldns/EL-5 ldns-installfix-r3167.patch, NONE, 1.1 ldns-rpathfix.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 ldns.spec, 1.21, 1.22 sources, 1.9, 1.10

Fri Jan 22 17:06:09 UTC 2010

Author: pwouters

Update of /cvs/extras/rpms/ldns/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10251

Modified Files:
	.cvsignore ldns.spec sources 
Added Files:
	ldns-installfix-r3167.patch ldns-rpathfix.patch 
Log Message:
* Fri Jan 22 2010 Paul Wouters <paul at xelerance.com> - 1.6.4-1
- Upgraded to 1.6.4
- Added ldns-python sub package
- Patch for installing ldns-python files
- Patch for rpath in 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	13 Feb 2009 21:22:37 -0000	1.6
+++ .cvsignore	22 Jan 2010 17:06:08 -0000	1.7
@@ -4,3 +4,4 @@ ldns-1.3.0.tar.gz
 ldns-1.4.0.tar.gz
 ldns-1.5.0.tar.gz
 ldns-1.5.1.tar.gz
+ldns-1.6.4.tar.gz


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/ldns.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ldns.spec	16 Aug 2009 05:32:56 -0000	1.21
+++ ldns.spec	22 Jan 2010 17:06:09 -0000	1.22
@@ -1,14 +1,27 @@
+%{?!with_python:      %global with_python      1}
+
+%if %{with_python}
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
+
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.6.1
-Release: 2%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
 Source: http://www.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, autoconf, automake, gcc-c++, openssl-devel, doxygen
-BuildRequires: perl, libpcap-devel
+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
+%endif
 
 %description
 ldns is a library with the aim to simplify DNS programing in C. All
@@ -19,32 +32,57 @@ packets.
 %package devel
 Summary: Development package that includes the ldns header files
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, openssl-devel
+Requires: %{name} = %{version}-%{release}
 
 %description devel
 The devel package contains the ldns library and the include files
 
+%if %{with_python}
+%package python
+Summary: Python extensions for ldns
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description python
+Python extensions for ldns
+%endif
+
+
 %prep
 %setup -q 
+%patch1
+%patch2
 # To built svn snapshots
-#rm config.guess config.sub ltmain.sh
-#libtoolize
-#autoreconf
-
-%configure --disable-rpath --with-sha2
+rm config.guess config.sub ltmain.sh
+aclocal
+libtoolize -c --install
+autoreconf --install
 
 %build
-make %{?_smp_mflags}
-(cd drill ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/)
-(cd examples ; %configure --disable-rpath --with-ldns=%{buildroot}/lib/)
-(cd drill ; make %{?_smp_mflags} )
-(cd examples ; make %{?_smp_mflags} )
+%configure --disable-rpath --disable-static --with-sha2 \
+%if %{with_python}
+ --with-pyldns
+%endif
+
+(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} )
+( cd examples ; make %{?_smp_mflags} )
 make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install
+
+make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install 
 make DESTDIR=%{buildroot} INSTALL="%{__install} -p" install-doc
+
+%if %{with_python}
+# remove execute perms from python files
+chmod a-x %{buildroot}%{python_sitelib}/*py
+%endif
+
 # don't package building script in doc
 rm doc/doxyparse.pl
 #remove doc stubs
@@ -53,7 +91,7 @@ rm -rf doc/.svn
 rm -rf doc/man
 
 # remove .la files
-rm -rf %{buildroot}%{_libdir}/*.la
+rm -rf %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitelib}/*.la
 (cd drill ; make DESTDIR=%{buildroot} install)
 (cd examples; make DESTDIR=%{buildroot} install)
 
@@ -64,27 +102,39 @@ rm -rf %{buildroot}
 %defattr(-,root,root)
 %{_libdir}/libldns*so.*
 %{_bindir}/drill
+%{_bindir}/ldnsd
+#%{_bindir}/ldns-*
 %{_bindir}/ldns-chaos
 %{_bindir}/ldns-compare-zones
 %{_bindir}/ldns-[d-z]*
-%{_bindir}/ldnsd
 %doc README LICENSE
 %{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libldns.a
 %{_libdir}/libldns*so
-%dir %{_includedir}/ldns
 %{_bindir}/ldns-config
+%dir %{_includedir}/ldns
 %{_includedir}/ldns/*.h
 %doc doc Changelog README
 
+%if %{with_python}
+%files python
+%defattr(-,root,root)
+%{python_sitelib}/*
+%endif
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Fri Jan 22 2010 Paul Wouters <paul at xelerance.com> - 1.6.4-1
+- Upgraded to 1.6.4
+- Added ldns-python sub package
+- Patch for installing ldns-python files
+- Patch for rpath in ldns-python
+
 * Sun Aug 16 2009 Paul Wouters <paul at xelerance.com> - 1.6.1-2
 - Bump version, sources file was not updated.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	16 Aug 2009 05:30:38 -0000	1.9
+++ sources	22 Jan 2010 17:06:09 -0000	1.10
@@ -1 +1,2 @@
 a44dafecdcc49aaea5d20ae15bc738c0  ldns-1.6.1.tar.gz
+6747d7bd96552ee5d8943f3abb24815f  ldns-1.6.4.tar.gz

