From 4eb85ca1c83f5cebe30f2cd0c1083b65c804575e Mon Sep 17 00:00:00 2001 From: Ondrej Vasik Date: Jul 10 2008 16:22:01 +0000 Subject: forgot to cvs add patch --- diff --git a/inn-2.4.5-dynlib.patch b/inn-2.4.5-dynlib.patch new file mode 100644 index 0000000..6ebecd7 --- /dev/null +++ b/inn-2.4.5-dynlib.patch @@ -0,0 +1,24 @@ +diff -up inn-2.4.5/history/Makefile.dynlib inn-2.4.5/history/Makefile +--- inn-2.4.5/history/Makefile.dynlib 2008-07-03 19:50:04.000000000 +0200 ++++ inn-2.4.5/history/Makefile 2008-07-03 19:50:50.000000000 +0200 +@@ -43,7 +43,7 @@ $(FIXSCRIPT): + + libinnhist.la: $(OBJECTS) $(LIBSTORAGE) $(LIBINN) + $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \ +- $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \ ++ $(LIBSTORAGE) $(LIBINN) $(EXTSTORAGELIBS) -L../lib/.libs -L../storage/.libs ${LIBS} \ + -rpath $(PATHLIB) -version-info 2:0:0 + + libinnhist.a: $(OBJECTS) +diff -up inn-2.4.5/storage/Makefile.dynlib inn-2.4.5/storage/Makefile +--- inn-2.4.5/storage/Makefile.dynlib 2008-07-03 19:52:48.000000000 +0200 ++++ inn-2.4.5/storage/Makefile 2008-07-03 19:42:34.000000000 +0200 +@@ -47,7 +47,7 @@ $(FIXSCRIPT): + + libstorage.la: $(OBJECTS) $(LIBINN) + $(LIBLD) $(LDFLAGS) -o $@ $(LOBJECTS) \ +- $(LIBINN) $(EXTSTORAGELIBS) $(LIBS) \ ++ $(LIBINN) $(EXTSTORAGELIBS) -L../lib/.libs ${LIBS} \ + -rpath $(PATHLIB) -version-info 2:0:0 + + libstorage.a: $(OBJECTS) diff --git a/inn.spec b/inn.spec index 92e818e..08f665c 100644 --- a/inn.spec +++ b/inn.spec @@ -194,7 +194,7 @@ echo '%{_libdir}/news/lib' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/inn-%{_a #Build filelist rm -rf $RPM_BUILD_ROOT/usr/lib/news/include echo "%defattr(-,news,news)" > files.list -find $RPM_BUILD_ROOT -type f -or -type l| \ +find $RPM_BUILD_ROOT -type f -or -type l | \ sed -e "s|$RPM_BUILD_ROOT||g" | \ sed 's|^/etc/cron|%config(noreplace) %attr(-,root,root) &|' | \ sed 's|^/etc/rc.d|%config(noreplace) %attr(-,root,root) &|' | \