- 1.0.0
- rename -devel -> -static (+Obsoletes/Provides: %name-devel)
This commit is contained in:
Rex Dieter
parent
581c7f13a5
commit
0214df1324
|
|
@ -1,5 +1,4 @@
|
|||
libassuan-0.6.10.tar.gz
|
||||
libassuan-0.6.10.tar.gz.sig
|
||||
libassuan-0.9.2.tar.bz2.sig
|
||||
libassuan-0.9.2.tar.bz2
|
||||
libassuan-0.9.3.tar.bz2.sig
|
||||
libassuan-1.0.0.tar.bz2
|
||||
libassuan-1.0.0.tar.bz2.sig
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
--- src/libassuan.m4~ 2006-10-14 23:36:40.000000000 +0300
|
||||
+++ src/libassuan.m4 2006-10-14 23:38:07.000000000 +0300
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
|
||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
-dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGSand LIBASSUAN_PTH_LIBS
|
||||
+dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
|
||||
[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
|
||||
@@ -144,7 +144,7 @@
|
||||
dnl and LIBASSUAN_PTHREAD_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
|
||||
-[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
|
||||
+[ _AM_PATH_LIBASSUAN_COMMON($1,pthread)
|
||||
if test $ok = yes; then
|
||||
LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
|
||||
LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
--- libassuan-0.9.3/src/libassuan.m4.m4patch 2006-10-06 10:28:15.000000000 -0500
|
||||
+++ libassuan-0.9.3/src/libassuan.m4 2006-10-10 08:33:12.000000000 -0500
|
||||
@@ -125,8 +125,8 @@
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
|
||||
[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
|
||||
if test $ok = yes; then
|
||||
- LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
|
||||
- LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
|
||||
+ LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
|
||||
+ LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
LIBASSUAN_PTH_CFLAGS=""
|
||||
@@ -146,8 +146,8 @@
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
|
||||
[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
|
||||
if test $ok = yes; then
|
||||
- LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
|
||||
- LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
|
||||
+ LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
|
||||
+ LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
LIBASSUAN_PTHREAD_CFLAGS=""
|
||||
|
|
@ -1,34 +1,32 @@
|
|||
|
||||
Name: libassuan
|
||||
Summary: GnuPG IPC library
|
||||
Version: 0.9.3
|
||||
Release: 2%{?dist}
|
||||
Version: 1.0.0
|
||||
Release: 1%{?dist}
|
||||
|
||||
License: LGPL
|
||||
Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2
|
||||
Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.bz2.sig
|
||||
Source0: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2
|
||||
Source1: ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
|
||||
URL: http://www.gnupg.org/
|
||||
Group: System Environment/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Patch1: libassuan-0.9.3-m4.patch
|
||||
Patch2: libassuan-0.9.3-m4-2.patch
|
||||
|
||||
BuildRequires: pth-devel
|
||||
|
||||
%description
|
||||
This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
|
||||
packages.
|
||||
|
||||
%package devel
|
||||
%package static
|
||||
Summary: GnuPG IPC library
|
||||
Group: Development/Libraries
|
||||
Requires: pth-devel
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(postun): /sbin/install-info
|
||||
Provides: %{name}-static = %{version}-%{release}
|
||||
%description devel
|
||||
This is the IPC library used by GnuPG 1.9/2, GPGME and a few other
|
||||
Obsoletes: %{name}-devel < %{version}-%{release}
|
||||
Provides: %{name}-devel = %{version}-%{release}
|
||||
%description static
|
||||
This is the IPC static library used by GnuPG 1.9/2, GPGME and a few other
|
||||
packages.
|
||||
|
||||
This package contains files needed to develop applications using %{name}.
|
||||
|
|
@ -37,9 +35,6 @@ This package contains files needed to develop applications using %{name}.
|
|||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch1 -p1 -b .m4patch
|
||||
%patch2 -p0 -b .m4patch-2
|
||||
|
||||
|
||||
%build
|
||||
#ifarch x86_64
|
||||
|
|
@ -59,14 +54,14 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
|
||||
|
||||
%check || :
|
||||
%check
|
||||
make check
|
||||
|
||||
|
||||
%post devel
|
||||
%post static
|
||||
/sbin/install-info %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
|
||||
|
||||
%postun devel
|
||||
%postun static
|
||||
if [ $1 -eq 0 ]; then
|
||||
/sbin/install-info --delete %{_infodir}/assuan.info %{_infodir}/dir &>/dev/null || :
|
||||
fi
|
||||
|
|
@ -76,7 +71,7 @@ fi
|
|||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files devel
|
||||
%files static
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
|
||||
%{_bindir}/*
|
||||
|
|
@ -87,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Nov 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 1.0.0-1
|
||||
- 1.0.0
|
||||
- rename -devel -> -static (+Obsoletes/Provides: %%name-devel)
|
||||
|
||||
* Wed Oct 18 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.9.3-2
|
||||
- another libassuan.m4 patch
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue