- release 2 (by relup.sh)

[packages/shishi.git] / shishi.spec

diff --git a/shishi.spec b/shishi.spec
index 30ac6afd8ee6202c84087dd62d8752f15fb96b3b..b8b3215ff80d1b6fabdbf60bc8582470006f1c8d 100644 (file)
--- a/shishi.spec
+++ b/shishi.spec
@@ -1,31 +1,32 @@
 Summary:       Shishi - an implementation of RFC 1510(bis) (Kerberos V5 authentication)
-Summary(pl.UTF-8):   Shishi - implementacja RFC 1510(bis) (uwierzytelniania Kerberos V5)
+Summary(pl.UTF-8):     Shishi - implementacja RFC 1510(bis) (uwierzytelniania Kerberos V5)
 Name:          shishi
-Version:       0.0.30
+Version:       1.0.2
 Release:       2
 Epoch:         0
-License:       GPL
+License:       GPL v3+
 Group:         Libraries
-Source0:       http://josefsson.org/shishi/releases/%{name}-%{version}.tar.gz
-# Source0-md5: aa89eea3400f2de5cab07f929048f16e
+Source0:       http://ftp.gnu.org/gnu/shishi/%{name}-%{version}.tar.gz
+# Source0-md5: 4dace6fdc67dec508ed75b852d316e64
 Source1:       %{name}-shishid.init
 Source2:       %{name}-shishid.sysconfig
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-pl.po-update.patch
 URL:           http://josefsson.org/shishi/
-BuildRequires: autoconf >= 2.60
-BuildRequires: automake >= 1:1.9
-BuildRequires: gettext-devel >= 0.14.1
+BuildRequires: autoconf >= 2.61
+BuildRequires: automake >= 1:1.11
+BuildRequires: gettext-devel >= 0.18.1
 BuildRequires: gnutls-devel >= 1.2.5
 BuildRequires: gtk-doc >= 1.1
 BuildRequires: libgcrypt-devel >= 1.1.43
 BuildRequires: libidn-devel >= 0.1.0
-BuildRequires: libtasn1-devel >= 0.3.1
+BuildRequires: libtasn1-devel >= 2.11
 BuildRequires: libtool >= 2:1.5
 BuildRequires: pam-devel
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: texinfo
 Requires(post,postun): /sbin/ldconfig
+Requires:      libtasn1 >= 2.11
 Provides:      group(shishi)
 Provides:      user(shishi)
 # should be moved to shishi-enabled inetutils-* if such packages would exist
@@ -65,14 +66,14 @@ centrum dystrybucji kluczy (KDC) także jest załączony.
 
 %package devel
 Summary:       Header files for Shishi library
-Summary(pl.UTF-8):   Pliki nagłówkowe biblioteki Shishi
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Shishi
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      gnutls-devel >= 1.2.5
 Requires:      gtk-doc-common
 Requires:      libgcrypt-devel >= 1.1.43
 Requires:      libidn-devel >= 0.1.0
-Requires:      libtasn1-devel >= 0.3.1
+Requires:      libtasn1-devel >= 2.11
 
 %description devel
 Header files for Shishi library.
@@ -82,7 +83,7 @@ Pliki nagłówkowe biblioteki Shishi.
 
 %package static
 Summary:       Static Shishi library
-Summary(pl.UTF-8):   Statyczna biblioteka Shishi
+Summary(pl.UTF-8):     Statyczna biblioteka Shishi
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
@@ -94,7 +95,7 @@ Statyczna biblioteka Shishi.
 
 %package shishid
 Summary:       shishid - Kerberos 5 server
-Summary(pl.UTF-8):   shishid - serwer Kerberosa 5
+Summary(pl.UTF-8):     shishid - serwer Kerberosa 5
 Group:         Networking/Daemons
 Requires(post,postun): /sbin/chkconfig
 Requires(post,preun):  rc-scripts
@@ -114,7 +115,7 @@ shishid to sieciowy demon służący do wydawania biletów Kerberosa 5.
 
 %package -n pam-pam_shishi
 Summary:       PAM module for RFC 1510 (Kerberos V5) authentication
-Summary(pl.UTF-8):   Moduł PAM do uwierzytelniania RFC 1510 (Kerberos V5)
+Summary(pl.UTF-8):     Moduł PAM do uwierzytelniania RFC 1510 (Kerberos V5)
 Group:         Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Obsoletes:     pam_shishi
@@ -128,20 +129,18 @@ Moduł PAM do uwierzytelniania RFC 1510 (Kerberos V5).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-
-rm -f po/stamp-po
 
 # doesn't build on sparc (too few B* constants) and wasn't packaged anyway
 %{__perl} -pi -e 's/^(SUBDIRS.*) rsh-redone/$1/' extra/Makefile.am
 
 %build
 %{__libtoolize}
-%{__aclocal} -I gl/m4 -I m4
+%{__aclocal} -I gl/m4 -I src/gl/m4 -I db/gl/m4 -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+       --disable-silent-rules \
        --with-libgcrypt \
        --with-pam-dir=/%{_lib}/security
 
@@ -150,7 +149,7 @@ rm -f po/stamp-po
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/%{_lib}/security,/etc/{sysconfig,rc.d/init.d}}
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -158,7 +157,7 @@ install -d $RPM_BUILD_ROOT{/%{_lib}/security,/etc/{sysconfig,rc.d/init.d}}
 %{__make} -C extra install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_shishi.{la,a}
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/security/pam_shishi.la
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/shishid
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/shishid
@@ -204,7 +203,10 @@ fi
 %attr(755,root,root) %{_bindir}/shisa
 %attr(755,root,root) %{_bindir}/shishi
 %attr(755,root,root) %{_sbindir}/keytab2shishi
-%attr(755,root,root) %{_libdir}/libshis*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libshisa.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libshisa.so.0
+%attr(755,root,root) %{_libdir}/libshishi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libshishi.so.0
 %dir %{_sysconfdir}/shishi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shishi/shisa.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/shishi/shishi.conf
@@ -219,15 +221,20 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libshis*.so
-%{_libdir}/libshis*.la
-%{_includedir}/shis*.h
+%attr(755,root,root) %{_libdir}/libshisa.so
+%attr(755,root,root) %{_libdir}/libshishi.so
+%{_libdir}/libshisa.la
+%{_libdir}/libshishi.la
+%{_includedir}/shisa.h
+%{_includedir}/shishi*.h
 %{_pkgconfigdir}/shishi.pc
-%{_mandir}/man3/*
+%{_mandir}/man3/shisa*.3*
+%{_mandir}/man3/shishi*.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libshis*.a
+%{_libdir}/libshisa.a
+%{_libdir}/libshishi.a
 
 %files shishid
 %defattr(644,root,root,755)
@@ -238,4 +245,4 @@ fi
 
 %files -n pam-pam_shishi
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/security/pam_shishi.so*
+%attr(755,root,root) /%{_lib}/security/pam_shishi.so