rpms/gnupg/devel gnupg.spec,1.78,1.79

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/pkgs/rpms/gnupg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6630

Modified Files:
	gnupg.spec 
Log Message:
- switch from %%{_libdir}/%{name} as libexecdir to regular old %{_libexecdir}
  (part of #225847)
- remove explicit configure arguments to use bzip2 and readline, which are
  the default and trigger errors when not present, but continue to explicitly
  request zlib so that we don't fall back to the internal one if something
  ever looks "off" about the system copy (part of #225847)
- convert the ru manual and doc files to UTF-8 (the ones which aren't already,
  rpmlint)



Index: gnupg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnupg/devel/gnupg.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- gnupg.spec	22 Jul 2008 19:56:01 -0000	1.78
+++ gnupg.spec	19 Feb 2009 20:31:32 -0000	1.79
@@ -39,6 +39,13 @@
 %patch0 -p1 -b .gcc
 %patch3 -p1 -b .dir
 %patch4 -p1 -b .gcc43
+
+# Convert these files to UTF-8, per rpmlint.
+iconv -f koi8-ru -t utf-8 doc/gpg.ru.1 > doc/gpg.ru.utf8.1
+mv doc/gpg.ru.utf8.1 doc/gpg.ru.1
+iconv -f iso-8859-15 -t utf-8 THANKS > THANKS.utf8
+mv THANKS.utf8 THANKS
+
 autoreconf
 
 %build
@@ -51,9 +58,7 @@
 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 \
+    --with-zlib --enable-noexecstack \
     $configure_flags
 make %{?_smp_mflags}
 env LANG=C expect -f %{SOURCE2}
@@ -103,11 +108,21 @@
 %{_datadir}/%{name}/faq.html
 %{_datadir}/%{name}/options.skel
 %{_infodir}/*
-%{_libdir}/%{name}
+%{_libexecdir}/*
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 
 %changelog
+* Thu Feb 19 2009 Nalin Dahyabhai <nalin at redhat.com>
+- switch from %%{_libdir}/%{name} as libexecdir to regular old %{_libexecdir}
+  (part of #225847)
+- remove explicit configure arguments to use bzip2 and readline, which are
+  the default and trigger errors when not present, but continue to explicitly
+  request zlib so that we don't fall back to the internal one if something
+  ever looks "off" about the system copy (part of #225847)
+- convert the ru manual and doc files to UTF-8 (the ones which aren't already,
+  rpmlint)
+
 * Tue Jul 22 2008 Nalin Dahyabhai <nalin at redhat.com> - 1.4.9-4
 - describe license as actually GPLv3+ with exceptions rather than just GPLv3+
   (Todd Zullinger, #447772)