diff --git a/gpgme.changes b/gpgme.changes index aa89793..3e65d52 100644 --- a/gpgme.changes +++ b/gpgme.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 14 13:05:39 UTC 2010 - cristian.rodriguez@opensuse.org + +- run spec cleaner +- fix -devel package dependencies + ------------------------------------------------------------------- Wed Apr 14 20:32:14 UTC 2010 - chris@computersalat.de diff --git a/gpgme.spec b/gpgme.spec index 3656350..737086b 100644 --- a/gpgme.spec +++ b/gpgme.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: gpgme @@ -25,18 +24,17 @@ BuildRequires: libpth-devel >= 2.0.7 %else BuildRequires: pth >= 2.0.7 %endif -BuildRequires: libgpg-error-devel >= 1.4 -BuildRequires: libassuan-devel >= 1.1.0 -License: GPLv2+ -Group: Productivity/Security -Requires: %install_info_prereq -AutoReqProv: on Version: 1.3.0 Release: 3 +License: GPLv2+ +Summary: A Library Designed to Give Applications Easy Access to GnuPG +Url: http://www.gnupg.org/related_software/gpgme/ +Group: Productivity/Security Source: ftp://ftp.gnupg.org/gcrypt/gpgme/%{name}-%{version}.tar.bz2 Source2: baselibs.conf -Url: http://www.gnupg.org/related_software/gpgme/ -Summary: A Library Designed to Give Applications Easy Access to GnuPG +BuildRequires: libassuan-devel >= 1.1.0 +BuildRequires: libgpg-error-devel >= 1.4 +Requires: %install_info_prereq Requires: gpg2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,18 +52,6 @@ done at a central place and every application benefits from this. Authors of MUAs should especially consider using GPGME. Creating a set of standard widgets for common key selection tasks is even planned. - -Authors: --------- - FSF - - Code taken from GnuPG 1.0: gpgme/w32-util.c, GnuPG 1.1: jnlib/. - - g10 Code GmbH - - All stuff since mid march 2001. - - Werner Koch - - Design and most stuff. - %package -n libgpgme11 License: GPLv2+ Summary: A Library Designed to give Applications easy Access to GnuPG @@ -88,31 +74,13 @@ done at a central place and every application benefits from this. Authors of MUAs should especially consider using GPGME. Creating a set of standard widgets for common key selection tasks is even planned. - - -Authors: --------- - FSF - - Code taken from GnuPG 1.0: gpgme/w32-util.c, GnuPG 1.1: jnlib/. - - g10 Code GmbH - - All stuff since mid march 2001. - - Werner Koch - - Design and most stuff. - %package -n libgpgme-devel License: GPLv2+ Summary: A Library Designed to give Applications easy Access to GnuPG Group: Development/Libraries/C and C++ -Requires: libgpgme11 = %{version} glibc-devel +Requires: glibc-devel Requires: libgpg-error-devel -%if 0%{?suse_version} >= 1120 -Requires: libpth-devel -%else -Requires: pth -%endif -Requires: libassuan-devel +Requires: libgpgme11 = %{version} Provides: gpgme-devel = %{version} Obsoletes: gpgme-devel < %{version} @@ -132,19 +100,6 @@ done at a central place and every application benefits from this. Authors of MUAs should especially consider using GPGME. Creating a set of standard widgets for common key selection tasks is even planned. - - -Authors: --------- - FSF - - Code taken from GnuPG 1.0: gpgme/w32-util.c, GnuPG 1.1: jnlib/. - - g10 Code GmbH - - All stuff since mid march 2001. - - Werner Koch - - Design and most stuff. - %prep %setup -q @@ -157,26 +112,24 @@ sh autogen.sh --with-gpg-version=2.0.10 \ --with-gpgsm-version=2.0.10 \ --with-gpgconf-version=2.0.10 \ - --with-gpg=%_bindir/gpg2 \ - --with-gpgsm=%_bindir/gpgsm \ - --with-gpgconf=%_bindir/gpgconf + --with-gpg=%{_bindir}/gpg2 \ + --with-gpgsm=%{_bindir}/gpgsm \ + --with-gpgconf=%{_bindir}/gpgconf %install -%makeinstall +%make_install # Do this now to make /usr/lib/rpm/brp-chuck-la happy: -rm %buildroot/%_libdir/*.la +rm %{buildroot}/%{_libdir}/*.la %check make check %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%post -n libgpgme11 -/sbin/ldconfig +%post -n libgpgme11 -p /sbin/ldconfig -%postun -n libgpgme11 -/sbin/ldconfig +%postun -n libgpgme11 -p /sbin/ldconfig %post %install_info --info-dir=%{_infodir} %{_infodir}/gpgme.info.gz