Attachment 147274 Details for Bug 225847 – patch correcting small issues mentioned above

[patch] patch correcting small issues mentioned above

spec.diff (text/plain), 4.64 KB, created by Todd Zullinger on 2007-02-03 15:37:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Todd Zullinger

Created: 2007-02-03 15:37:04 UTC

Size: 4.64 KB

patch

obsolete

>Index: gnupg.spec
>===================================================================
>RCS file: /cvs/dist/rpms/gnupg/devel/gnupg.spec,v
>retrieving revision 1.63
>diff -u -p -r1.63 gnupg.spec
>--- gnupg.spec	6 Dec 2006 17:44:10 -0000	1.63
>+++ gnupg.spec	3 Feb 2007 15:26:52 -0000
>@@ -1,7 +1,7 @@
>-Summary: A GNU utility for secure communication and data storage.
>+Summary: A GNU utility for secure communication and data storage
> Name: gnupg
> Version: 1.4.6
>-Release: 3
>+Release: 4%{?dist}
> License: GPL
> Group: Applications/System
> Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.bz2
>@@ -12,15 +12,23 @@ Patch1: gnupg-1.4.2-curl.patch
> Patch2: gnupg-1.4.5-termlib.patch
> Patch3: gnupg-1.4.6-dir.patch
> URL: http://www.gnupg.org/
>-BuildPrereq: autoconf, automake, bzip2-devel, expect, ncurses-devel
>-BuildPrereq: openldap-devel, readline-devel, zlib-devel, gettext-devel
>-BuildPrereq: curl-devel
>+BuildRequires: autoconf
>+BuildRequires: automake
>+BuildRequires: bzip2-devel
>+BuildRequires: curl-devel
>+BuildRequires: expect
>+BuildRequires: gettext
>+BuildRequires: ncurses-devel
>+BuildRequires: openldap-devel
>+BuildRequires: readline-devel
>+BuildRequires: zlib-devel
> %ifnarch s390 s390x
>-BuildPrereq: libusb-devel
>+BuildRequires: libusb-devel
> %endif
> Provides: gpg, openpgp
>-Prereq: /sbin/install-info
>-BuildRoot: %{_tmppath}/%{name}-%{version}-root
>+Requires(post): /sbin/install-info
>+Requires(preun): /sbin/install-info
>+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> %description
> GnuPG (GNU Privacy Guard) is a GNU utility for encrypting data and
>@@ -47,14 +55,14 @@ configure_flags=--disable-asm
> CFLAGS="$RPM_OPT_FLAGS -fPIE -DPIC" ; export CFLAGS
> LDFLAGS="$RPM_OPT_FLAGS -pie -Wl,-z,relro,-z,now" ; export LDFLAGS
> %configure \
>-	--disable-rpath \
>-	--libexecdir=%{_libdir} \
>-	--with-zlib --with-bzip2 --with-readline --enable-noexecstack \
>-	--with-libcurl \
>-	$configure_flags
>+        --disable-rpath \
>+        --enable-noexecstack \
>+        $configure_flags
> make %{?_smp_mflags}
>+env LANG=C expect -f %{SOURCE2}
>+
>+%check
> make check
>-env LANG=C expect -f $RPM_SOURCE_DIR/gnupg-shm-coprocessing.expect
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
>@@ -62,31 +70,21 @@ rm -rf $RPM_BUILD_ROOT
> %install
> rm -rf $RPM_BUILD_ROOT
> make install DESTDIR=$RPM_BUILD_ROOT
>-install -m644 doc/gnupg1.info $RPM_BUILD_ROOT/%{_infodir}
>-sed 's^\.\./g[0-9\.]*/^^g' tools/lspgpot > lspgpot
>-install -m755 lspgpot $RPM_BUILD_ROOT%{_bindir}/lspgpot
>+install -m755 tools/lspgpot $RPM_BUILD_ROOT%{_bindir}/lspgpot
>+install -d -m0755 %{buildroot}%{_libdir}/%{name}
> rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
> %find_lang %name
> 
> %post
>-if test -s %{_infodir}/gnupg1.info.gz ; then
>-    /sbin/install-info %{_infodir}/gnupg1.info.gz %{_infodir}/dir 2> /dev/null
>-fi
>-if ! test -s %{_infodir}/gpg.info.gz ; then
>-    /sbin/install-info --delete %{_infodir}/gpg.info.gz %{_infodir}/dir 2> /dev/null
>-fi
>-if ! test -s %{_infodir}/gpgv.info.gz ; then
>-    /sbin/install-info --delete %{_infodir}/gpgv.info.gz %{_infodir}/dir 2> /dev/null
>-fi
>-exit 0
>+/sbin/install-info %{_infodir}/gnupg1.info %{_infodir}/dir 2> /dev/null || :
>+# delete old info pages
>+/sbin/install-info --delete %{_infodir}/gpg.info %{_infodir}/dir 2> /dev/null || :
>+/sbin/install-info --delete %{_infodir}/gpgv.info %{_infodir}/dir 2> /dev/null || :
> 
> %preun
> if [ $1 = 0 ]; then
>-    if test -s %{_infodir}/gnupg1.info.gz ; then
>-        /sbin/install-info --delete %{_infodir}/gnupg1.info.gz %{_infodir}/dir 2> /dev/null
>-    fi
>+    /sbin/install-info --delete %{_infodir}/gnupg1.info %{_infodir}/dir 2> /dev/null || :
> fi
>-exit 0
> 
> %files -f %{name}.lang
> %defattr(-,root,root)
>@@ -98,11 +96,22 @@ exit 0
> %{_datadir}/%{name}/faq.html
> %{_datadir}/%{name}/options.skel
> %{_infodir}/*
>-%{_libdir}/%{name}
>+%dir %{_libdir}/%{name}
>+%{_libexecdir}/%{name}
> %{_mandir}/man1/*
> %{_mandir}/man7/*
> 
> %changelog
>+* Fri Feb 02 2007 Todd Zullinger <tmz@pobox.com> - 1.4.6-4
>+- minor changes to bring specfile more in line with packaging guidelines
>+- remove unneeded flags from %%configure
>+- remove manual installation of gnupg1.info, the upstream Makefiles do this
>+- remove unnecessary sed fix to lspgpot
>+- s/BuildPrereq/BuildRequires
>+- use || : in install-info scriptlets
>+- use %%{_libexecdir}/%{name} for keyserver helpers, as upstream does
>+- create and own %%{_libdir}/%{name}
>+
> * Wed Dec  6 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.4.6-3
> - rebuild
> 
>@@ -383,7 +392,7 @@ exit 0
> * Mon Apr 30 2001 Nalin Dahyabhai <nalin@redhat.com>
> - update to 1.0.5, dropping various patches
> 
>-* Tue Feb 27 2001 Trond Eivind Glomsrød <teg@redhat.com>
>+* Tue Feb 27 2001 Trond Eivind GlomsrÃ¸d <teg@redhat.com>
> - langify
> - strip binaries in /usr/lib/gnupg
>

Actions: View | Diff

Attachments on bug 225847: 147274