- updated to 2.0.0

- removed obsolete shared patch

Changed files:
    libassuan-shared.patch -> 1.6
    libassuan.spec -> 1.36

diff --git a/libassuan-shared.patch b/libassuan-shared.patch
deleted file mode 100644 (file)
index 5491c4e..0000000
--- a/libassuan-shared.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- libassuan-1.0.1/src/Makefile.am.orig       2006-11-21 19:17:18.000000000 +0100
-+++ libassuan-1.0.1/src/Makefile.am    2006-11-23 19:30:28.776620250 +0100
-@@ -25,7 +25,7 @@
- MOSTLYCLEANFILES = assuan-errors.c
- 
- if HAVE_PTH
--libassuan_pth = libassuan-pth.a
-+libassuan_pth = libassuan-pth.la
- else
- libassuan_pth = 
- endif
-@@ -33,7 +33,7 @@
- bin_SCRIPTS = libassuan-config
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libassuan.m4
--lib_LIBRARIES = libassuan.a $(libassuan_pth)
-+lib_LTLIBRARIES = libassuan.la $(libassuan_pth)
- include_HEADERS = assuan.h
- 
- 
-@@ -55,13 +55,13 @@
-       assuan-logging.c \
-       assuan-socket.c
- 
--libassuan_a_SOURCES = $(common_sources) assuan-io.c
--libassuan_a_LIBADD = @LIBOBJS@
-+libassuan_la_SOURCES = $(common_sources) assuan-io.c
-+libassuan_la_LIBADD = @LTLIBOBJS@
- 
- if HAVE_PTH
--libassuan_pth_a_SOURCES = $(common_sources) assuan-io-pth.c
--libassuan_pth_a_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS)
--libassuan_pth_a_LIBADD = @LIBOBJS@
-+libassuan_pth_la_SOURCES = $(common_sources) assuan-io-pth.c
-+libassuan_pth_la_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS)
-+libassuan_pth_la_LIBADD = @LTLIBOBJS@ $(PTH_LIBS)
- endif
- 
- assuan-errors.c : assuan.h mkerrors
---- libassuan-0.6.0/configure.ac.orig  2003-08-06 10:34:42.000000000 +0200
-+++ libassuan-0.6.0/configure.ac       2003-08-10 11:56:23.735375928 +0200
-@@ -57,7 +57,7 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- #AC_ARG_PROGRAM
- 
- if test "$GCC" = yes; then
---- libassuan-0.9.3/tests/Makefile.am.orig     2006-10-10 12:05:25.000000000 +0200
-+++ libassuan-0.9.3/tests/Makefile.am  2006-10-11 12:02:10.555971000 +0200
-@@ -37,5 +37,5 @@
- 
- noinst_HEADERS = common.h
- noinst_PROGRAMS = $(TESTS)
--LDADD =  ../src/libassuan.a  $(NETLIBS) # $(GPG_ERROR_LIBS)
-+LDADD =  ../src/libassuan.la  $(NETLIBS) # $(GPG_ERROR_LIBS)
- 

diff --git a/libassuan.spec b/libassuan.spec
index 6a8377a214b0f150142ef40bdf6359b49c81a4b6..afd5a4b3264242b39212ff87cb940a696d233d5d 100644 (file)
--- a/libassuan.spec
+++ b/libassuan.spec
@@ -5,22 +5,22 @@
 Summary:       Assuan - an IPC library for non-persistent servers
 Summary(pl.UTF-8):     Assuan - biblioteka IPC dla serwerów nie działających ciągle
 Name:          libassuan
-Version:       1.0.5
+Version:       2.0.0
 Release:       1
 Epoch:         1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       ftp://ftp.gnupg.org/gcrypt/libassuan/%{name}-%{version}.tar.bz2
-# Source0-md5: c2db0974fcce4401f48f3fa41c4edc5a
-Patch0:                %{name}-shared.patch
-Patch1:                %{name}-info.patch
-Patch2:                %{name}-ac.patch
+# Source0-md5: 59bc0ae7194c412d7a522029005684b2
+Patch0:                %{name}-info.patch
+Patch1:                %{name}-ac.patch
 URL:           http://www.gnupg.org/related_software/libassuan/
 BuildRequires: autoconf >= 2.61
 BuildRequires: automake >= 1:1.10
-BuildRequires: libtool
-BuildRequires: pth-devel >= 1.2.0
+BuildRequires: libgpg-error-devel >= 1.4
+BuildRequires: libtool >= 2:2.2.6
 BuildRequires: texinfo
+Requires:      libgpg-error >= 1.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -40,6 +40,7 @@ Summary:      Header files for assuan library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki assuan
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      libgpg-error-devel >= 1.4
 
 %description devel
 Header files for assuan library.
@@ -63,7 +64,6 @@ Statyczna biblioteka assuan.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -72,7 +72,7 @@ Statyczna biblioteka assuan.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_static_libs:--disable-static}
+       %{?with_static_libs:--enable-static}
 %{__make}
 
 %install
@@ -89,10 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%post devel    -p      /sbin/postshell
+%post  devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun devel  -p      /sbin/postshell
+%postun        devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %files
@@ -100,16 +100,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/libassuan.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libassuan.so.0
-%attr(755,root,root) %{_libdir}/libassuan-pth.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libassuan-pth.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/libassuan-config
 %attr(755,root,root) %{_libdir}/libassuan.so
-%attr(755,root,root) %{_libdir}/libassuan-pth.so
 %{_libdir}/libassuan.la
-%{_libdir}/libassuan-pth.la
 %{_includedir}/assuan.h
 %{_aclocaldir}/libassuan.m4
 %{_infodir}/assuan.info*
@@ -118,5 +114,4 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libassuan.a
-%{_libdir}/libassuan-pth.a
 %endif