- updated to 1.0.3, cleanup

- don't use libtermcap and static mozldap

Changed files:
    fedora-setuputil.spec -> 1.9

diff --git a/fedora-setuputil.spec b/fedora-setuputil.spec
index fb9d6c44c0a0989d1b6a868de4381dfd96e7146e..9d7c5c949684f363fd11d53a912a05bb12d600aa 100644 (file)
--- a/fedora-setuputil.spec
+++ b/fedora-setuputil.spec
@@ -1,24 +1,23 @@
-# TODO:
-# - external svrcore
-# - files, maybe subpackages; clean
-#
 Summary:       Fedora Setup SDK - server configuration library
 Summary(pl):   Fedora Setup SDK - biblioteka do konfiguracji serwera
 Name:          fedora-setuputil
-Version:       1.0
+Version:       1.0.3
 Release:       0.1
 License:       LGPL
 Group:         Aplications/Libraries
 Source0:       http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
-# Source0-md5: 6bc26ba2edee75c3c8d5bf9a21bda7b8
+# Source0-md5: f2ce6537b6b02f34b8a7409bedfe8168
 URL:           http://directory.fedora.redhat.com/wiki/SetupUtil
 BuildRequires: libstdc++-devel
-BuildRequires: libtermcap-devel
-BuildRequires: mozldap-static
+BuildRequires: mozldap-devel
 BuildRequires: ncurses-devel
-#BuildRequires:        svrcore-devel
+BuildRequires: perl-base
+Requires:      libstdc++-devel
+Requires:      mozldap-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _includedir     /usr/include/%{name}
+
 %description
 Fedora Setup SDK is a library to configure your server using the
 Configuration Directory Server.
@@ -32,25 +31,29 @@ Configuration Directory Servera.
 
 %build
 %{__make} \
+       ARCH_OPT="%{rpmcflags} -I/usr/include/ncurses" \
+       ARCH_DEBUG="%{rpmcflags} -I/usr/include/ncurses" \
+       BUILD_DEBUG=%{?debug:full}%{!?debug:optimize} \
+       CC="%{__cc}" \
+       CCC="%{__cxx}" \
+       CXX="%{__cxx}" \
+       CURSES="-lncurses" \
        MAKE=make \
-       LDAPSDK_INCDIR=/usr/include/mozldap \
-       LDAPSDK_LIBPATH=%{_libdir} \
-       SVRCORE_INCDIR=$PWD/../mozilla/security/svrcore \
-       CFLAGS="%{rpmcflags} -I/usr/include/ncurses -Wno-deprecated \
-               -DLINUX -Dlinux -DBSD -D_POSIX_SOURCE -D_XOPEN_SOURCE \
-               -D_BSD_SOURCE -DHAVE_USE_PTHREADS=1 -DXP_UNIX \
-               -DBUILD_NUM=1"
+       NSOS_TEST=PLD \
+       LDAPCSDK_INCLUDE_DIR=/usr/include/mozldap \
+       LDAPCSDK_LIB_DIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
-install built/package/*/include/* $RPM_BUILD_ROOT%{_includedir}
-install built/package/*/lib/* $RPM_BUILD_ROOT%{_libdir}
+
+install built/package/*/include/*.h $RPM_BUILD_ROOT%{_includedir}
+install built/package/*/lib/*.a $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_includedir}/*
-%{_libdir}/*
+%{_libdir}/libinstall.a
+%{_includedir}