packages: libassuan1/libassuan1.spec - frist try to make libassuan1 and lib...

[shadzik]

Author: shadzik                      Date: Tue Mar 30 13:48:24 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- frist try to make libassuan1 and libassuan (2.0.0) co-exists on one system
- rel 2

---- Files affected:
packages/libassuan1:
   libassuan1.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/libassuan1/libassuan1.spec
diff -u packages/libassuan1/libassuan1.spec:1.5 packages/libassuan1/libassuan1.spec:1.6
--- packages/libassuan1/libassuan1.spec:1.5	Tue Mar 30 00:55:26 2010
+++ packages/libassuan1/libassuan1.spec	Tue Mar 30 15:48:18 2010
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Assuan - biblioteka IPC dla serwerów nie działających ciągle
 Name:		libassuan1
 Version:	1.0.5
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/libassuan/%{realname}-%{version}.tar.bz2
@@ -17,13 +17,13 @@
 Patch0:		%{realname}-shared.patch
 Patch1:		%{realname}-info.patch
 Patch2:		%{realname}-ac.patch
+Patch3:		%{name}-soname.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:	texinfo
-Conflicts:	%{realname}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,7 +42,6 @@
 Summary:	Header files for assuan library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki assuan
 Group:		Development/Libraries
-Conflicts:	%{realname}-devel
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -55,7 +54,6 @@
 Summary:	Static assuan library
 Summary(pl.UTF-8):	Statyczna biblioteka assuan
 Group:		Development/Libraries
-Conflicts:	%{realname}-static
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
@@ -69,6 +67,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -103,27 +102,27 @@
 %files
 %defattr(644,root,root,755)
 %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
+%attr(755,root,root) %{_libdir}/libassuan1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libassuan1.so.0
+%attr(755,root,root) %{_libdir}/libassuan1-pth.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libassuan1-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
+%attr(755,root,root) %{_bindir}/libassuan1-config
+%attr(755,root,root) %{_libdir}/libassuan1.so
+%attr(755,root,root) %{_libdir}/libassuan1-pth.so
+%{_libdir}/libassuan1.la
+%{_libdir}/libassuan1-pth.la
 %{_includedir}/assuan.h
-%{_aclocaldir}/libassuan.m4
+%{_aclocaldir}/libassuan1.m4
 %{_infodir}/assuan.info*
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libassuan.a
-%{_libdir}/libassuan-pth.a
+%{_libdir}/libassuan1.a
+%{_libdir}/libassuan1-pth.a
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -132,6 +131,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/03/30 13:48:18  shadzik
+- frist try to make libassuan1 and libassuan (2.0.0) co-exists on one system
+- rel 2
+
 Revision 1.5  2010/03/29 22:55:26  shadzik
 - fix setup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libassuan1/libassuan1.spec?r1=1.5&r2=1.6&f=u