- updated for 1.1.0

Changed files:
    fedora-adminutil-link.patch -> 1.2

diff --git a/fedora-adminutil-link.patch b/fedora-adminutil-link.patch
index 8ef12b574cade0290550368ab7de13c2aea8df41..38225167099effe75788b29cea80c3fc85fede16 100644 (file)
--- a/fedora-adminutil-link.patch
+++ b/fedora-adminutil-link.patch
@@ -1,22 +1,65 @@
---- fedora-adminutil-1.0.4/lib/libadminutil/Makefile.orig      2006-08-24 23:03:44.000000000 +0200
-+++ fedora-adminutil-1.0.4/lib/libadminutil/Makefile   2006-11-15 15:21:47.999505000 +0100
-@@ -99,7 +99,7 @@
- else
- $(SO_LIB): $(OBJS)
-       rm -f $@
--      $(LINK_DLL) $(OBJS) $(DEPLIBS)
-+      $(LINK_DLL) -Wl,-soname,$(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION) $(OBJS) $(DEPLIBS) $(LDAP_NOSSL_LINK) $(addprefix -l, $(NSPR_LIBNAMES)) -licuuc
-       cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT)
-       cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION)
- endif
---- fedora-adminutil-1.0.4/lib/libadmsslutil/Makefile.orig     2006-05-12 01:30:32.000000000 +0200
-+++ fedora-adminutil-1.0.4/lib/libadmsslutil/Makefile  2006-11-15 15:35:59.089505000 +0100
-@@ -98,7 +98,7 @@
- else
- $(SO_LIB): $(OBJS)
-       rm -f $@
--      $(LINK_DLL) $(OBJS) $(DEPLIBS)
-+      $(LINK_DLL) -Wl,-soname,$(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION) $(OBJS) $(DEPLIBS) $(addprefix -l, $(NSPR_LIBNAMES)) -lnss3 -lssl3 -lldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) -lssldap$(LDAP_SUF)$(LDAP_DLL_PRESUF) -L$(OBJLIBDIR) -ladminutil
-       cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT)
-       cd $(OBJLIBDIR); rm -f $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION); ln -s $(SO_NAME)$(SO_EXT) $(SO_NAME)$(SO_COREEXT).$(ADMSDK_SO_MAJORVERSION)
- endif
+--- adminutil-1.1.0/Makefile.am.orig   2007-06-16 10:42:14.617909469 +0200
++++ adminutil-1.1.0/Makefile.am        2007-06-16 10:50:24.605832289 +0200
+@@ -16,7 +16,8 @@
+ #------------------------
+ NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
+ NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
+-LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
++LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60
++LDAPSDK_NOSSL_LINK = @ldapsdk_lib@ -lldap60 -lprldap60
+ SASL_LINK = @sasl_lib@ -lsasl2
+ ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
+ 
+@@ -30,7 +31,7 @@
+ TESTS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
+ 
+ TEST_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/include @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+-TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
++TEST_LDADD = libadmsslutil.la libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(ICU_LINK)
+ 
+ retrieveSIE_SOURCES = tests/retrieveSIE.c
+ retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS)
+@@ -108,7 +109,7 @@
+       lib/libadminutil/uginfo.c
+ 
+ libadminutil_la_CPPFLAGS =  $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+-libadminutil_la_LIBADD =  $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
++libadminutil_la_LIBADD =  $(NSPR_LINK) $(LDAPSDK_NOSSL_LINK) $(ICU_LINK)
+ 
+ #------------------------
+ # libadmsslutil
+@@ -122,4 +123,4 @@
+       lib/libadmsslutil/uginfossl.c
+ 
+ libadmsslutil_la_CPPFLAGS = $(AM_CPPFLAGS) @nspr_inc@ @ldapsdk_inc@ @icu_inc@
+-libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
++libadmsslutil_la_LIBADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(ICU_LINK) $(top_builddir)/libadminutil.la
+--- adminutil-1.1.0/configure.ac.orig  2007-04-04 21:37:36.000000000 +0200
++++ adminutil-1.1.0/configure.ac       2007-06-16 10:50:40.698749373 +0200
+@@ -87,7 +87,6 @@
+ m4_include(m4/nspr.m4)
+ m4_include(m4/nss.m4)
+ m4_include(m4/mozldap.m4)
+-m4_include(m4/sasl.m4)
+ m4_include(m4/icu.m4)
+ m4_include(m4/fhs.m4)
+ 
+@@ -114,8 +113,6 @@
+ AC_SUBST(ldapsdk_inc)
+ AC_SUBST(ldapsdk_lib)
+ AC_SUBST(ldapsdk_libdir)
+-AC_SUBST(sasl_inc)
+-AC_SUBST(sasl_lib)
+ AC_SUBST(icu_inc)
+ AC_SUBST(icu_lib)
+ AC_SUBST(icu_libdir)
+--- adminutil-1.1.0/adminutil.pc.in.orig       2007-04-04 21:37:35.000000000 +0200
++++ adminutil-1.1.0/adminutil.pc.in    2007-06-16 11:00:35.900667997 +0200
+@@ -6,6 +6,6 @@
+ Name: @PACKAGE_NAME@
+ Description: Utility library for directory server administration
+ Version: @PACKAGE_VERSION@
+-Requires: nspr, nss, svrcore, mozldap, icu
++Requires: nspr, nss, mozldap, icu
+ Libs: -ladmsslutil -ladminutil
+ Cflags: -I${includedir}/admsslutil -I${includedir}/adminutil