X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffedora-adminutil.git;a=blobdiff_plain;f=fedora-adminutil.spec;h=8103d631f0848fbb461f65c1e764a25ee24aa45e;hp=c04766b5a9546948597f69c443453546d731d7b4;hb=HEAD;hpb=4e80145a7d50c7920c55e66382815417e1cbd19c

diff --git a/fedora-adminutil.spec b/fedora-adminutil.spec
index c04766b..8103d63 100644
--- a/fedora-adminutil.spec
+++ b/fedora-adminutil.spec
@@ -1,21 +1,23 @@
-# TODO: shared libs soname and proper linking
 Summary:	Fedora Admin Util - API to install and configure Fedora Server software
-Summary(pl):	Fedora Admin Util - API do instalacji i konfiguracji oprogramowania Fedora Server
+Summary(pl.UTF-8):	Fedora Admin Util - API do instalacji i konfiguracji oprogramowania Fedora Server
 Name:		fedora-adminutil
-Version:	1.0.4
+Version:	1.1.6
 Release:	0.1
-License:	LGPL
+License:	LGPL v2.1
 Group:		Libraries
-Source0:	http://directory.fedora.redhat.com/sources/%{name}-%{version}.tar.gz
-# Source0-md5:	8bafc54cdc08e3886b6a68d0ac9367a0
-URL:		http://directory.fedora.redhat.com/wiki/AdminUtil
-BuildRequires:	icu
-BuildRequires:	libicu-devel
-BuildRequires:	libstdc++-devel
-BuildRequires:	mozldap-devel
-BuildRequires:	nspr-devel
-BuildRequires:	nss-devel
-BuildRequires:	perl-base
+Source0:	http://directory.fedoraproject.org/sources/adminutil-%{version}.tar.bz2
+# Source0-md5:	b01d441f81d3d260ba84e4f0d5311721
+Patch0:		%{name}-link.patch
+URL:		http://directory.fedoraproject.org/wiki/AdminUtil
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	icu >= 3.4
+BuildRequires:	libicu-devel >= 3.4
+BuildRequires:	libtool >= 1:1.4.2-9
+BuildRequires:	mozldap-devel >= 6.0
+BuildRequires:	nspr-devel >= 1:4.6
+BuildRequires:	nss-devel >= 1:3.11
+BuildRequires:	pkgconfig
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -27,53 +29,62 @@ using the authentication with the Directory Server. AdminUtil is
 needed to build the Admin Server as well as the Directory Server's
 admin components.
 
-%description -l pl
-AdminUtil to zestaw funkcji narzêdziowych napisanych w C, podzielonych
-na dwie grupy: libadminutil i libadmsslutil. S± u¿ywane g³ównie przez
-Admin Server / us³ugi CGI do komunikowania siê z konfiguracyjnym
-Directory Serverem. Pokrywaj± m.in. logowanie do Admin Servera przy
-u¿yciu uwierzytelnienia wzglêdem Directory Servera. AdminUtil jest
-potrzebny do zbudowania Admin Servera oraz komponentów
+%description -l pl.UTF-8
+AdminUtil to zestaw funkcji narzędziowych napisanych w C, podzielonych
+na dwie grupy: libadminutil i libadmsslutil. Są używane głównie przez
+Admin Server / usługi CGI do komunikowania się z konfiguracyjnym
+Directory Serverem. Pokrywają m.in. logowanie do Admin Servera przy
+użyciu uwierzytelnienia względem Directory Servera. AdminUtil jest
+potrzebny do zbudowania Admin Servera oraz komponentów
 administracyjnych Directory Servera.
 
 %package devel
 Summary:	Header files for Fedora Admin Util libraries
-Summary(pl):	Pliki nag³ówkowe bibliotek Fedora Admin Util
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Fedora Admin Util
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	mozldap-devel
-Requires:	nspr-devel
+Requires:	libicu-devel >= 3.4
+Requires:	mozldap-devel >= 6.0
+Requires:	nspr-devel >= 1:4.6
+# for admsslutil
+Requires:	nss-devel >= 1:3.11
 
 %description devel
 Header files for Fedora Admin Util libraries.
 
-%description devel -l pl
-Pliki nag³ówkowe bibliotek Fedora Admin Util.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek Fedora Admin Util.
+
+%package static
+Summary:	Static Fedora Admin Util libraries
+Summary(pl.UTF-8):	Statyczne biblioteki Fedora Admin Util
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static Fedora Admin Util libraries.
+
+%description static -l pl.UTF-8
+Statyczne biblioteki Fedora Admin Util.
 
 %prep
-%setup -q
+%setup -q -n adminutil-%{version}
+%patch0 -p1
 
 %build
-%{__make} \
-	ARCH_DEBUG="%{rpmcflags}" \
-	ARCH_OPT="%{rpmcflags}" \
-	BUILD_DEBUG=%{?debug:full}%{!?debug:optimize} \
-	CC="%{__cc}" \
-	CCC="%{__cxx}" \
-	MAKE="%{__make}" \
-	NSOS_TEST=PLD \
-	ICU_GENRB=%{_bindir}/genrb \
-	ICU_INCPATH=%{_includedir}/icu \
-	LDAPSDK_INCDIR=%{_includedir}/mozldap \
-	NSPR_INCDIR=%{_includedir}/nspr \
-	SECURITY_INCDIR=%{_includedir}/nss
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+%configure
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}
 
-cp -r built/adminutil/*/include/* $RPM_BUILD_ROOT%{_includedir}
-cp -r built/adminutil/*/lib/* $RPM_BUILD_ROOT%{_libdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,10 +94,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_libdir}/adminutil-properties
+%doc NEWS README
+%attr(755,root,root) %{_libdir}/libadminutil.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libadminutil.so.0
+%attr(755,root,root) %{_libdir}/libadmsslutil.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libadmsslutil.so.0
+%{_datadir}/adminutil
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/adminutil-1.0
+%attr(755,root,root) %{_libdir}/libadminutil.so
+%attr(755,root,root) %{_libdir}/libadmsslutil.so
+%{_libdir}/libadminutil.la
+%{_libdir}/libadmsslutil.la
+%{_includedir}/libadminutil
+%{_includedir}/libadmsslutil
+%{_pkgconfigdir}/adminutil.pc
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libadminutil.a
+%{_libdir}/libadmsslutil.a