- pl fixes, unified Source URL, short-circuit fixes

- don't run libtoolize alone, it breaks things

Changed files:
    libhome.spec -> 1.3

diff --git a/libhome.spec b/libhome.spec
index e53c6de56dbbb325266296976f2f16a79cbf864b..faeb8b9e87c03330a2b5b2687f2c2fdd8d95bda2 100644 (file)
--- a/libhome.spec
+++ b/libhome.spec
@@ -1,11 +1,11 @@
-Summary:       libhome is a configurable getpwnam(3) emulator
-Summary(pl):   libhome jest konfigurowalnym emulatorem funkcji getpwnam(3)
+Summary:       libhome - a configurable getpwnam(3) emulator
+Summary(pl):   libhome - konfigurowalny emulator funkcji getpwnam(3)
 Name:          libhome
 Version:       0.8.1
 Release:       0.1
 License:       LGPL v2
 Group:         Libraries
-Source0:       http://mesh.dl.sourceforge.net/sourceforge/pll/%{name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/pll/%{name}-%{version}.tar.gz
 # Source0-md5: 44f06ff97b594741f0558efb51960d29
 URL:           http://pll.sourceforge.net/
 BuildRequires: autoconf
@@ -26,34 +26,35 @@ foreign servers.
 Biblioteka obs³uguje MySQL, Open LDAP lub plik /etc/passwd.
 
 Jej zadaniem jest zamiana wywo³ania getpwnam w demonach systemowych,
-które potrzebuj± autoryzacji lub idetyfikacji u¿ytkowniaka w oparciu o
-dane z obcych serwerów.
+które potrzebuj± uwierzytelnienia lub identyfikacji u¿ytkownika w
+oparciu o dane z obcych serwerów.
 
 %prep
 %setup -q
 
 %build
-%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__autoheader}
-#%{__automake}
+# ???
+#%%{__libtoolize}
+#%%{__aclocal}
+#%%{__autoconf}
+#%%{__autoheader}
+#%%{__automake}
 %configure \
        --with-ldap \
-        --with-mysql
+       --with-mysql
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT%{_libdir}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
-install -d $RPM_BUILD_ROOT%{_bindir}/
-install -d $RPM_BUILD_ROOT%{_libdir}/
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/
-
-mv .libs/home_finger $RPM_BUILD_ROOT%{_bindir}/
-mv .libs/libhome.1.* $RPM_BUILD_ROOT%{_libdir}/
-mv .libs/libhome $RPM_BUILD_ROOT%{_libdir}/
-mv home.conf $RPM_BUILD_ROOT%{_sysconfdir}/
+# XXX: use make install
+install .libs/home_finger $RPM_BUILD_ROOT%{_bindir}
+install .libs/libhome.so.1.* $RPM_BUILD_ROOT%{_libdir}
+cp -a .libs/libhome.so $RPM_BUILD_ROOT%{_libdir}
+install home.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -63,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README VERSION COPYING.LIB
-%attr(755,root,root) %{_libdir}/libhome.*
+%doc NEWS README VERSION COPYING
 %attr(755,root,root) %{_bindir}/*
-%attr(644,root,root) %{_sysconfdir}/*
+%attr(755,root,root) %{_libdir}/libhome.so.*.*.*
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/*