[perl-Mail-IMAPClient/el6/master: 7/7] Merge branch 'master' into el6
by Paul Howarth
commit 5b632aafc4b7ed560617d41fc0db9b5a161dcbfb
Merge: 3463ca9 7b3b607
Author: Paul Howarth <paul(a)city-fan.org>
Date: Sat Oct 2 10:14:46 2010 +0100
Merge branch 'master' into el6
Conflicts:
.gitignore
perl-Mail-IMAPClient.spec
.gitignore | 2 +-
perl-Mail-IMAPClient.spec | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 0650f07,c68acd8..52352ef
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- Mail-IMAPClient-3.21.tar.gz
-Mail-IMAPClient-3.25.tar.gz
++/Mail-IMAPClient-3.25.tar.gz
13 years, 6 months
[perl-Mail-IMAPClient/el6/master] (7 commits) ...Merge branch 'master' into el6
by Paul Howarth
Summary of changes:
829b006... Fix typo that causes a failure to update the common directo (*)
4ea9b15... - rebuild against perl 5.10.1 (*)
16632d7... - Mass rebuild with perl-5.12.0 (*)
4662966... 3.25 (*)
cb7327d... dist-git conversion (*)
7b3b607... Fix docfile dependencies (*)
5b632aa... Merge branch 'master' into el6
(*) This commit already existed in another branch; no separate mail sent
13 years, 6 months
[perl-Mail-IMAPClient] Fix docfile dependencies
by Paul Howarth
commit 7b3b6078187dbcbfaf8e06109edbc9956bb353c5
Author: Paul Howarth <paul(a)city-fan.org>
Date: Sat Oct 2 10:04:42 2010 +0100
Fix docfile dependencies
- Turn off exec bits on examples to avoid docfile dependencies (#639523)
- Fix character encoding in documentation
perl-Mail-IMAPClient.spec | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/perl-Mail-IMAPClient.spec b/perl-Mail-IMAPClient.spec
index 7f70f08..a220de1 100644
--- a/perl-Mail-IMAPClient.spec
+++ b/perl-Mail-IMAPClient.spec
@@ -1,6 +1,6 @@
Name: perl-Mail-IMAPClient
Version: 3.25
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An IMAP Client API
Group: Development/Libraries
License: GPL+ or Artistic
@@ -21,6 +21,13 @@ to and an IMAP conversation with an IMAP server.
%setup -q -n Mail-IMAPClient-%{version}
sed -i 's#/usr/local/bin/perl#/usr/bin/perl#' examples/*.pl
+# Turn off exec bits in examples to avoid docfile dependencies
+chmod -c -x examples/*.pl
+
+# Fix character encoding in documentation
+iconv -f iso-8859-1 -t utf-8 < Changes > Changes.utf8
+mv Changes.utf8 Changes
+
%build
# the extended tests cannot be run without an IMAP server
yes n | %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -45,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*.3*
%changelog
+* Sat Oct 2 2010 Paul Howarth <paul(a)city-fan.org> - 3.25-2
+- turn off exec bits on examples to avoid docfile dependencies (#639523)
+- fix character encoding in documentation
+
* Mon Jul 12 2010 Tom "spot" Callaway <tcallawa(a)redhat.com> - 3.25-1
- update to 3.25
13 years, 6 months