[cpm] Fix FTBFS rhbz #913928

mbooth mbooth at fedoraproject.org
Mon Mar 4 13:40:42 UTC 2013


commit 9cad8892415180da87b84c8de0db7367ff5d5053
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Mar 4 13:40:33 2013 +0000

    Fix FTBFS rhbz #913928
    
    - Fix source URL.

 cpm.pod  |   12 ++++++++++++
 cpm.spec |   16 +++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)
---
diff --git a/cpm.pod b/cpm.pod
index 898dbbc..18f2949 100644
--- a/cpm.pod
+++ b/cpm.pod
@@ -81,6 +81,8 @@ searchpattern
 
 display the version and exit
 
+=back
+
 =head1 KEYS
 
 =over 8
@@ -121,11 +123,15 @@ edit the current node and suggest a password.
 
 write the database to disk.
 
+=back
+
 =head1 ENVIRONMENT
 
 The following environment variables are used by the application,
 all other variables are discarded at program startup:
 
+=over 8
+
 =item B<GNUPGHOME>
 
 If set directory used instead of "~/.gnupg".
@@ -158,16 +164,22 @@ Terminal settings of the currently used terminal.
 
 Terminal settings of the currently used terminal.
 
+=back
+
 =head1 IMPORT
 
 The data import utilities are installed in /usr/share/cpm and the following formats can be imported:
 
+=over 8
+
 =item . csv
 
 =item . passwordsafe
 
 =item . pms
 
+=back
+
 =head1 SEE ALSO
 
 gpg(1)
diff --git a/cpm.spec b/cpm.spec
index fd9dfb0..13f1895 100644
--- a/cpm.spec
+++ b/cpm.spec
@@ -1,19 +1,18 @@
 Name:		cpm
 Version:	0.23
-Release:	0.8.beta%{?dist}
+Release:	0.9.beta%{?dist}
 Summary:	Console Password Manager
 
 Group:		Applications/Databases
 License:	GPLv2+
 URL:		http://www.harry-b.de/dokuwiki/doku.php?id=harry:cpm
-Source0:	http://dl.sf.net/%{name}/%{name}-%{version}beta.tar.gz
+Source0:	http://downloads.sourceforge.net/passwordms/%{name}-%{version}beta.tar.gz
 Source1:	cpm.pod
 Patch0:		cpm-0.23beta-make.patch
 Patch1:		cpm-0.23beta-disclaimer.patch
 Patch2:		cpm-0.23beta-sigint.patch
 Patch3:		cpm-0.23beta-open.patch
 Patch4:		cpm-0.23beta-ignore-diff-result.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	cracklib-devel, cracklib-dicts
 BuildRequires:	gpgme-devel
@@ -23,6 +22,7 @@ BuildRequires:	ncurses-devel
 BuildRequires:	libxml2-devel >= 2.6.16,
 BuildRequires:	zlib-devel
 BuildRequires:	gettext
+BuildRequires:	perl-podlators
 
 %description
 CPM is a ncurses based console tool to manage passwords
@@ -52,23 +52,21 @@ make %{?_smp_mflags}
 pod2man --release=%{name}-%{version}beta --center="%{summary}" --name=%{name} %{SOURCE1} ./docs/cpm.1
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT mandir="%{_mandir}"
 install -D -p -m 644 conf/cpmrc-default $RPM_BUILD_ROOT%{_sysconfdir}/cpmrc
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc conf/cpmrc-default docs/ChangeLog docs/changelog docs/GPLv2 docs/README ./share/cpm/*
 %attr (4755,root,root) %{_bindir}/cpm
 %config(noreplace) %{_sysconfdir}/cpmrc
 %{_mandir}/man1/cpm*
 
 %changelog
+* Mon Mar 04 2013 Mat Booth <fedora at matbooth.co.uk> - 0.23-0.9.beta
+- Fix FTBFS rhbz #913928
+- Fix source URL.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.23-0.8.beta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 


More information about the scm-commits mailing list