- updated to 1.0.2

- removed obsolete am,glibc2.16,libtasn1-3 patches

diff --git a/shishi-am.patch b/shishi-am.patch
deleted file mode 100644 (file)
index dff5d46..0000000
--- a/shishi-am.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- shishi-1.0.1/configure.ac~ 2012-03-12 19:18:21.000000000 +0100
-+++ shishi-1.0.1/configure.ac  2012-11-21 13:57:49.229400717 +0100
-@@ -24,7 +24,7 @@
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE([1.10 -Wall -Werror -Wno-override])
-+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-override])
- AM_SILENT_RULES([yes])
- 
- # Library code modified:                              REVISION++

diff --git a/shishi-glibc2.16.patch b/shishi-glibc2.16.patch
deleted file mode 100644 (file)
index 10eaf2f..0000000
--- a/shishi-glibc2.16.patch
+++ /dev/null
@@ -1,34 +0,0 @@
->From 50eb0a03e7109e3a772bcb9fb6ff5af2649fd3e1 Mon Sep 17 00:00:00 2001
-From: Eray Aslan <address@hidden>
-Date: Tue, 9 Oct 2012 08:27:57 +0000
-Subject: [PATCH] Fix build failure with glibc-2.16.0. gets is removed in C11
-
-
-Signed-off-by: Eray Aslan <address@hidden>
----
- gl/stdio.in.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/gl/stdio.in.h b/gl/stdio.in.h
-index 06d9780..fa04a10 100644
---- a/gl/stdio.in.h
-+++ b/gl/stdio.in.h
-@@ -713,10 +713,13 @@ _GL_CXXALIAS_SYS (gets, char *, (char *s));
- # endif
- _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides C11
-+   removed it.  */
-+#ifdef gets
-+#undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-+#endif
- 
- 
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
--- 
-1.7.12
-

diff --git a/shishi-libtasn1-3.patch b/shishi-libtasn1-3.patch
deleted file mode 100644 (file)
index 8d5e039..0000000
--- a/shishi-libtasn1-3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- shishi-1.0.1/lib/asn1.c~   2012-02-08 13:17:44.000000000 +0100
-+++ shishi-1.0.1/lib/asn1.c    2012-11-21 14:25:44.413593428 +0100
-@@ -32,6 +32,10 @@
- 
- #define ASN1NAME "KerberosV5Spec2."
- 
-+#ifndef MAX_ERROR_DESCRIPTION_SIZE
-+#define MAX_ERROR_DESCRIPTION_SIZE 128
-+#endif
-+
- /* Generated by asn1Parser from ASN.1 module. */
- extern const ASN1_ARRAY_TYPE shishi_asn1_tab[];
- 

diff --git a/shishi.spec b/shishi.spec
index bf0cd0477077484e1b53a181f651dc09fb60448b..06e080f8d5c62c54d21f8cd1fc78e0f2e6597798 100644 (file)
--- a/shishi.spec
+++ b/shishi.spec
@@ -1,22 +1,19 @@
 Summary:       Shishi - an implementation of RFC 1510(bis) (Kerberos V5 authentication)
 Summary(pl.UTF-8):     Shishi - implementacja RFC 1510(bis) (uwierzytelniania Kerberos V5)
 Name:          shishi
-Version:       1.0.1
-Release:       2
+Version:       1.0.2
+Release:       1
 Epoch:         0
 License:       GPL v3+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/shishi/%{name}-%{version}.tar.gz
-# Source0-md5: 25c3d61fe62e1eaf0d730c2e7b5e1375
+# Source0-md5: 4dace6fdc67dec508ed75b852d316e64
 Source1:       %{name}-shishid.init
 Source2:       %{name}-shishid.sysconfig
 Patch0:                %{name}-info.patch
-Patch1:                %{name}-am.patch
-Patch2:                %{name}-glibc2.16.patch
-Patch3:                %{name}-libtasn1-3.patch
 URL:           http://josefsson.org/shishi/
 BuildRequires: autoconf >= 2.61
-BuildRequires: automake >= 1:1.10
+BuildRequires: automake >= 1:1.11
 BuildRequires: gettext-devel >= 0.18.1
 BuildRequires: gnutls-devel >= 1.2.5
 BuildRequires: gtk-doc >= 1.1
@@ -132,9 +129,6 @@ Moduł PAM do uwierzytelniania RFC 1510 (Kerberos V5).
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # 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
@@ -163,7 +157,7 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
 %{__make} -C extra install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $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