Attachment 155392 Details for Bug 235293 – diffs

[patch] diffs

cvsdiffs (text/plain), 7.57 KB, created by Rich Megginson on 2007-05-24 20:43:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-05-24 20:43:09 UTC

Size: 7.57 KB

patch

obsolete

>Index: adminutil/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminutil/Makefile.am,v
>retrieving revision 1.3
>diff -u -8 -r1.3 Makefile.am
>--- adminutil/Makefile.am	17 May 2007 19:25:12 -0000	1.3
>+++ adminutil/Makefile.am	24 May 2007 20:39:41 -0000
>@@ -12,25 +12,28 @@
> AM_CPPFLAGS = $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(ADMINUTIL_DEFINES) $(ADMINUTIL_INCLUDES)
> 
> #------------------------
> # Linker Flags
> #------------------------
> NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
> NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
> LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
>+if enable_tests
> SASL_LINK = @sasl_lib@ -lsasl2
>+endif
> ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
> 
> #------------------------
> # Build Products
> #------------------------
> lib_LTLIBRARIES = libadminutil.la libadmsslutil.la
> pkgdata_DATA = root.res en.res en_US.res
> 
>+if enable_tests
> check_PROGRAMS = retrieveSIE retrieveSIEssl psetread psetreadssl psetwrite
> 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)
> 
> retrieveSIE_SOURCES = tests/retrieveSIE.c
> retrieveSIE_CPPFLAGS = $(TEST_CPPFLAGS)
>@@ -46,16 +49,17 @@
> 
> psetreadssl_SOURCES = tests/psetreadssl.c
> psetreadssl_CPPFLAGS = $(TEST_CPPFLAGS)
> psetreadssl_LDADD = $(TEST_LDADD)
> 
> psetwrite_SOURCES = tests/psetwrite.c
> psetwrite_CPPFLAGS = $(TEST_CPPFLAGS)
> psetwrite_LDADD = $(TEST_LDADD)
>+endif
> 
> #------------------------
> # Installed Files
> #------------------------
> adminincdir=$(includedir)/libadminutil
> admsslincdir=$(includedir)/libadmsslutil
> 
> admininc_DATA = $(srcdir)/include/libadminutil/admutil.h \
>@@ -118,10 +122,10 @@
> 	lib/libadmsslutil/certmgt.c \
> 	lib/libadmsslutil/psetcssl.c \
> 	lib/libadmsslutil/secpwd.c \
> 	lib/libadmsslutil/srvutilssl.c \
> 	lib/libadmsslutil/sslerror.c \
> 	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 = libadminutil.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(ICU_LINK)
> libadmsslutil_la_LDFLAGS = -version-number $(subst .,:,$(PACKAGE_VERSION))
>Index: adminutil/adminutil.spec
>===================================================================
>RCS file: /cvs/dirsec/adminutil/adminutil.spec,v
>retrieving revision 1.5
>diff -u -8 -r1.5 adminutil.spec
>--- adminutil/adminutil.spec	23 May 2007 13:56:01 -0000	1.5
>+++ adminutil/adminutil.spec	24 May 2007 20:39:41 -0000
>@@ -2,17 +2,17 @@
> %define           nss_version 3.11
> %define           svrcore_version 4.0
> %define           mozldap_version 6.0
> %define           icu_version 3.4
> 
> Summary:          Utility library for directory server administration
> Name:             adminutil
> Version:          1.1.1
>-Release:          2%{?dist}
>+Release:          3%{?dist}
> License:          LGPL
> URL:              http://directory.fedoraproject.org/wiki/AdminUtil
> Group:            Development/Libraries
> BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> BuildRequires:    nspr-devel >= %{nspr_version}
> BuildRequires:    nss-devel >= %{nss_version}
> BuildRequires:    svrcore-devel >= %{svrcore_version}
> BuildRequires:    mozldap-devel >= %{mozldap_version}
>@@ -30,45 +30,44 @@
> store their preferences and configuration parameters in LDAP, without
> having to know anything about LDAP.  The configuration is cached in a
> local file, allowing applications to function even if the LDAP server
> is down.  The other code is typically used by CGI programs used for
> directory server management, containing GET/POST processing code as
> well as resource handling (ICU ures API).
> 
> %package devel
>-Summary: Development and header files for %{name}
>-Group: Development/Libraries
>+Summary:  Development and header files for %{name}
>+Group:    Development/Libraries
> Requires: %{name} = %{version}-%{release}
>-Requires:      pkgconfig
>-BuildRequires: nspr-devel >= %{nspr_version}
>-BuildRequires: nss-devel >= %{nss_version}
>-BuildRequires: svrcore-devel >= %{svrcore_version}
>-BuildRequires: mozldap-devel >= %{mozldap_version}
>-BuildRequires: libicu-devel >= %{icu_version}
>-BuildRequires: icu >= %{icu_version}
>+Requires: pkgconfig
>+Requires: nspr-devel >= %{nspr_version}
>+Requires: nss-devel >= %{nss_version}
>+Requires: svrcore-devel >= %{svrcore_version}
>+Requires: mozldap-devel >= %{mozldap_version}
>+Requires: libicu-devel >= %{icu_version}
> 
> %description devel
> Development files and header files necessary to build applications
> that use %{name}.
> 
> %prep
> %setup -q
> 
> %build
> 
>-%configure
>-make
>+%configure --disable-tests
>+%{__make} %{?_smp_mflags}
> 
> %install
> %{__rm} -rf $RPM_BUILD_ROOT
> 
>-make install DESTDIR=$RPM_BUILD_ROOT
>-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
>-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
>+%{__make} install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
>+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.a
>+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
> 
> %clean
> %{__rm} -rf $RPM_BUILD_ROOT
> 
> %post -p /sbin/ldconfig
> %postun -p /sbin/ldconfig
> 
> %files
>@@ -80,16 +79,22 @@
> %files devel
> %defattr(-,root,root,-)
> %{_libdir}/pkgconfig/%{name}.pc
> %{_libdir}/*.so
> %{_includedir}/libadminutil
> %{_includedir}/libadmsslutil
> 
> %changelog
>+* Wed May 23 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.1-3
>+- more fedora review stuff - use macros consistently
>+- make sure install preserves timestamps
>+- use lgpl instead of gpl for acclanglist.c
>+- fix undefined weak symbols in libadmsslutil
>+
> * Fri May 18 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.1-2
> - pkgconfig is a requires not a build requires
> 
> * Thu May 17 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.1-1
> - Many bug fixes - bumped version to 1.1.1
> - fixed concerns from Fedora package review
> 
> * Wed Mar 28 2007 Rich Megginson <rmeggins@redhat.com> - 1.1.0-1
>Index: adminutil/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminutil/configure.ac,v
>retrieving revision 1.3
>diff -u -8 -r1.3 configure.ac
>--- adminutil/configure.ac	8 May 2007 19:25:45 -0000	1.3
>+++ adminutil/configure.ac	24 May 2007 20:39:41 -0000
>@@ -66,33 +66,49 @@
>   *)
>     platform_defs=""
>     platform=""
>     ;;
> esac
> AC_SUBST([platform_defs])
> 
> AC_MSG_CHECKING(for --enable-debug)
>-AC_ARG_ENABLE(debug, [  --enable-debug         Enable debug features],
>+AC_ARG_ENABLE(debug,
>+              AS_HELP_STRING([--enable-debug], [Enable debug features]),
> [
>   AC_MSG_RESULT(yes)
>   debug_defs="-DLDAP_DEBUG"
> ],
> [
>   AC_MSG_RESULT(no)
>   debug_defs=""
> ])
> AC_SUBST([debug_defs])
> 
>+if test -z "$enable_tests" ; then
>+   enable_tests=yes # default is on - --disable-tests to disable
>+fi
>+AC_MSG_CHECKING(for --enable-tests)
>+AC_ARG_ENABLE(tests,
>+              AS_HELP_STRING([--enable-tests], [Enable tests to be built (default: yes)]))
>+if test "$enable_tests" = "yes" ; then
>+  AC_MSG_RESULT(yes)
>+else
>+  AC_MSG_RESULT(no)
>+fi
>+AM_CONDITIONAL(enable_tests,test "$enable_tests" = "yes")
>+
> AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
> 
> m4_include(m4/nspr.m4)
> m4_include(m4/nss.m4)
> m4_include(m4/mozldap.m4)
>+if test "$enable_tests" = "yes" ; then
> m4_include(m4/sasl.m4)
>+fi
> m4_include(m4/icu.m4)
> m4_include(m4/fhs.m4)
> 
> # installation paths - by default, configure will just
> # use /usr as the prefix for everything, which means
> # /usr/etc and /usr/var.  FHS sez to use /etc and /var.
> if test "$with_fhs" = "yes"; then
>   ac_default_prefix=/usr

Actions: View | Diff

Attachments on bug 235293: 155166 | 155254 | 155258 | 155265 | 155295 | 155392 | 155467 | 155491