- updated to 0.69

- updated libtool patch, drop unnecessary libstdc++ dependency

diff --git a/libdomainkeys-libtool.patch b/libdomainkeys-libtool.patch
index 60f14e4a2ec8787850cd7ae76bd6950dcbdcd72b..e4800a57aa407a856d90ced8b1faf9d91a28c070 100644 (file)
--- a/libdomainkeys-libtool.patch
+++ b/libdomainkeys-libtool.patch
@@ -1,59 +1,54 @@
-diff -urbB libdomainkeys-0.68.org/Makefile libdomainkeys-0.68/Makefile
---- libdomainkeys-0.68.org/Makefile    2005-08-30 22:31:39.000000000 +0200
-+++ libdomainkeys-0.68/Makefile        2005-09-29 21:24:08.000000000 +0200
-@@ -2,7 +2,7 @@
- CFLAGS=-DBIND_8_COMPAT -O2
+--- libdomainkeys-0.69/Makefile.orig   2006-01-18 01:28:58.000000000 +0100
++++ libdomainkeys-0.69/Makefile        2017-11-19 10:33:48.827768358 +0100
+@@ -3,58 +3,49 @@
  #CFLAGS += -DDK_DEBUG -DDK_HASH_BUFF -Wall
+ #CFLAGS += -DUNIXWARE
  INCS=-I.
 -LIBS=-L. -ldomainkeys -lcrypto
 +LIBS=-lcrypto -lresolv
  MAKE=make
++libdir=/usr/lib
  
- UNAME := $(shell uname)
-@@ -14,49 +14,44 @@
-       CFLAGS += -DUNIXWARE
- endif
+-dktest: dktest.o libdomainkeys.a dns.lib socket.lib
+-      $(CC) $(CFLAGS) -o dktest dktest.o $(LIBS) `cat dns.lib` `cat socket.lib`
++dktest: dktest.o libdomainkeys.la
++      libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o dktest dktest.o libdomainkeys.la
  
-+dktest: dktest.lo libdomainkeys.la
-+      libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ dktest.lo libdomainkeys.la $(LIBS)
+ dktest.o: dktest.c domainkeys.h
+       $(CC) $(CFLAGS) -c dktest.c $(INCS)
  
--dktest: dktest.o libdomainkeys.a dns.lib
--      $(CC) $(CFLAGS) -o dktest dktest.o $(LIBS) `cat dns.lib`
-+dktest.lo: dktest.c domainkeys.h libdomainkeys.la
-+      libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ -c $<
- 
--dktest.o: dktest.c domainkeys.h
--      $(CC) $(CFLAGS) -c dktest.c $(INCS)
--
 -testtrace: testtrace.o dktrace.o dktrace.h
 -      $(CC) $(CFLAGS) -o testtrace testtrace.o dktrace.o
--
++testtrace: testtrace.o dktrace.lo dktrace.h
++      libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) -o testtrace testtrace.o dktrace.lo
+ 
 -dktrace.o: dktrace.c dktrace.h
-+testtrace: testtrace.lo dktrace.lo dktrace.h libdomainkeys.la
-+      libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ $< $(LIBS)
++dktrace.lo: dktrace.c dktrace.h
  
  makeheader: makeheader.c
--      $(CC) $(CFLAGS) -o makeheader makeheader.c
-+      libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ $<
-+
- domainkeys.o: domainkeys.c
+       $(CC) $(CFLAGS) -o makeheader makeheader.c
+-domainkeys.o: domainkeys.c
 -      $(CC) $(CFLAGS) -c domainkeys.c $(INCS)
 -dns_txt.o: dns_txt.c
 -      $(CC) $(CFLAGS) -c dns_txt.c
--dnstest.o: dnstest.c
--      $(CC) $(CFLAGS) -c dnstest.c
--dnstest: dnstest.o dns_txt.o libdomainkeys.a dns.lib
--      $(CC) $(CFLAGS) -o dnstest dnstest.o dns_txt.o `cat dns.lib` $(LIBS) 
++domainkeys.lo dns_txt.lo dktrace.lo: %.lo: %.c
++      libtool --mode=compile --tag=CC $(CC) $(CFLAGS) -c $< -o $@ $(INCS)
+ dnstest.o: dnstest.c
+       $(CC) $(CFLAGS) -c dnstest.c
+ dnstest: dnstest.o dns_txt.o
+       $(CC) $(CFLAGS) -o dnstest dnstest.o dns_txt.o
 -dns.lib: dnstest.c
 -      (if $(MAKE) dnstest >/dev/null 2>&1; then echo -lresolv; else echo ""; fi) >dns.lib
-+      libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ -c $<
-+      
-+dnstest.lo: dnstest.c
-+      libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ -c $<
-+      
-+dnstest: dnstest.lo dns_txt.lo libdomainkeys.la
-+      libtool --mode=link --tag=CXX $(CC) $(INCS) $(CFLAGS) -o $@ $< $(LIBS)
-+      
+-       rm -f dnstest
+ 
+ socktest.o: socktest.c
+       $(CC) $(CFLAGS) -c socktest.c
+ socktest: socktest.o
+       $(CC) $(CFLAGS) -o socktest socktest.o -lsocket
+-socket.lib: socktest.c
+-      (if $(MAKE) socktest >/dev/null 2>&1; then echo -lsocket -lnsl; else echo ""; fi) >socket.lib
+-      rm -f socktest
+ 
  domainkeys.h: domainkeys.c makeheader
        ./makeheader <domainkeys.c >domainkeys.h
  
@@ -61,29 +56,20 @@ diff -urbB libdomainkeys-0.68.org/Makefile libdomainkeys-0.68/Makefile
 -      rm -f libdomainkeys.a
 -      ar cr libdomainkeys.a domainkeys.o dns_txt.o dktrace.o
 -      ranlib libdomainkeys.a
--
--python: domainkeys_wrap.o _domainkeys.so
--
--domainkeys_wrap.o: domainkeys.h domainkeys.i domainkeys_wrap.c
--      #swig -python -module domainkeys domainkeys.i
--      $(CC) $(CFLAGS) -c domainkeys_wrap.c  -I/usr/include/python2.4/
-+domainkeys.lo dns_txt.lo dktrace.lo: %.lo: %.c
-+      libtool --mode=compile --tag=CXX $(CC) $(INCS) $(CFLAGS) $(OPTS) -o $@ -c $<
-+      
 +libdomainkeys.la: domainkeys.lo dns_txt.lo dktrace.lo
-+      libtool --mode=link --tag=CXX $(CC) domainkeys.lo dns_txt.lo dktrace.lo -o $@ -rpath /usr/lib -version-info 0:66 $(LIBS)
-+
-+domainkeys_wrap.o: domainkeys_wrap.c
-+      $(CC) $(CFLAGS) -c domainkeys_wrap.c  -I /usr/include/python2.2/
++      libtool --mode=link --tag=CC $(CC) $(LDFLAGS) $(CFLAGS) domainkeys.lo dns_txt.lo dktrace.lo -o $@ -rpath $(libdir) -version-info 0:69 $(LIBS)
+ 
+ python: domainkeys_wrap.o _domainkeys.so
+ 
+ domainkeys_wrap.o: domainkeys.h domainkeys.i domainkeys_wrap.c
+       #swig -python -module domainkeys domainkeys.i
+-      $(CC) $(CFLAGS) -c domainkeys_wrap.c  -I/usr/include/python2.4/
++      $(CC) $(CFLAGS) -fPIC -c domainkeys_wrap.c  $(shell pkg-config --cflags python2)
  
 -_domainkeys.so: domainkeys.o dns_txt.o dktrace.o domainkeys_wrap.o
--      ld -shared domainkeys.o dns_txt.o dktrace.o domainkeys_wrap.o -lcrypto -lresolv -o _domainkeys.so
-+_domainkeys.so: domainkeys.o dns_txt.o
-+      ld -shared domainkeys.o dns_txt.o domainkeys_wrap.o -lcrypto -lresolv -o _domainkeys.so
+-      ld -shared domainkeys.o dns_txt.o dktrace.o domainkeys_wrap.o -lcrypto `cat dns.lib` -o _domainkeys.so
++_domainkeys.so: domainkeys_wrap.o libdomainkeys.la
++      $(CC) $(LDFLAGS) $(CFLAGS) -shared domainkeys_wrap.o -L.libs -ldomainkeys -o _domainkeys.so $(LIBS)
  
  clean:
--      rm -f *.o *.so libdomainkeys.a dns.lib dnstest makeheader dktest testtrace domainkeys.h
-+      rm -f *.o libdomainkeys.a dns.lib dnstest makeheader dktest testtrace domainkeys.h
- 
- # 
- distributionfile:
+       rm -f *.o *.so libdomainkeys.a dns.lib dnstest socktest makeheader dktest testtrace domainkeys.h

diff --git a/libdomainkeys.spec b/libdomainkeys.spec
index 44bd2071259f13841f72d8ff3a5a06349d5fc1dd..8d0ceea2494d95417c601df4120b99a83ba94041 100644 (file)
--- a/libdomainkeys.spec
+++ b/libdomainkeys.spec
@@ -1,18 +1,17 @@
 Summary:       DomainKey Library for email servers & clients
 Summary(pl.UTF-8):     Biblioteka DomainKey dla serwerów i klientów poczty elektronicznej
 Name:          libdomainkeys
-Version:       0.68
-Release:       7
+Version:       0.69
+Release:       1
 License:       Yahoo! DomainKeys Public License Agreement v1.1
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/domainkeys/%{name}-%{version}.tar.gz
-# Source0-md5: c9fe164d6296e7ad5468580875ac4f2e
+Source0:       http://downloads.sourceforge.net/domainkeys/%{name}-%{version}.tar.gz
+# Source0-md5: 15ec065c6f645a0b9fde3f1ff7681127
 Patch0:                %{name}-libtool.patch
 Patch1:                %{name}-segv.patch
 Patch2:                %{name}-dknewkey.patch
 URL:           http://domainkeys.sourceforge.net/
-BuildRequires: libstdc++-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:1.5
 BuildRequires: openssl-devel
 Requires:      mktemp
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -57,15 +56,17 @@ Statyczna biblioteka libdomainkeys.
 %build
 %{__make} \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags} -DBIND_8_COMPAT"
+       CFLAGS="%{rpmcflags} %{rpmcppflags} -DBIND_8_COMPAT" \
+       LDFLAGS="%{rpmldflags}"
+       libdir=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir}}
 
-libtool --mode=install install dknewkey dktest $RPM_BUILD_ROOT%{_bindir}
-install dktrace.h domainkeys.h $RPM_BUILD_ROOT%{_includedir}
 libtool --mode=install install libdomainkeys.la $RPM_BUILD_ROOT%{_libdir}
+libtool --mode=install install dknewkey dktest $RPM_BUILD_ROOT%{_bindir}
+cp -p dktrace.h domainkeys.h $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,15 +77,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *.html CHANGES
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_bindir}/dknewkey
+%attr(755,root,root) %{_bindir}/dktest
+%attr(755,root,root) %{_libdir}/libdomainkeys.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdomainkeys.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/libdomainkeys.so
+%{_libdir}/libdomainkeys.la
+%{_includedir}/dktrace.h
+%{_includedir}/domainkeys.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libdomainkeys.a