Merge branch 'master' into el6

Conflicts:
	.gitignore
	sources
	yapet.spec
This commit is contained in:
Christopher Meng 2014-03-25 12:24:28 +08:00
commit f00779222e
3 changed files with 43 additions and 46 deletions

5
.gitignore vendored
View File

@ -1 +1,4 @@
yapet-0.6.tar.gz
/yapet-0.6.tar.gz
/yapet-0.7.tar.bz2
/yapet-0.8pre2.tar.bz2
/yapet-1.0.tar.bz2

View File

@ -1,3 +1 @@
30ee2bf2d4658e667b8eea4a62704b76 yapet-0.6.tar.gz
2d70b470b40b9c662988f4b8f8d4b333 yapet-0.7.tar.bz2
b48a8f49e2f69b9ba12a5ec668422628 yapet-0.7.tar.gz
a3cf3c274abefdbee15acd74dbdbb1ee yapet-1.0.tar.bz2

View File

@ -1,68 +1,64 @@
Name: yapet
Version: 0.7
Release: 1%{?dist}
Summary: Curses based password encryption tool
Group: Applications/Productivity
License: GPLv3+ with exceptions
URL: http://www.guengel.ch/myapps/%{name}/
Source0: http://www.guengel.ch/myapps/%{name}/downloads/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel
BuildRequires: ncurses-devel
BuildRequires: gettext
#global pre pre2
Name: yapet
Version: 1.0
Release: 1%{?pre}%{?dist}
Summary: Curses based password encryption tool
License: GPLv3+ with exceptions
URL: http://www.guengel.ch/myapps/%{name}/
Source0: http://www.guengel.ch/myapps/%{name}/downloads/%{name}-%{version}%{?pre}.tar.bz2
BuildRequires: gettext
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
%description
YAPET is a text based password manager using the Blowfish encryption algorithm.
Because of its small footprint and very few library dependencies, it is suited
for installing on desktop and server systems alike.
%prep
%setup -q
%setup -qn %{name}-%{version}%{?pre}
for i in README DESIGN
for f in ./DESIGN ./README
do
iconv -f iso-8859-1 -t utf-8 $i |sed 's|\r||g' > $i.utf8
touch -c -r $i $i.utf8
mv $i.utf8 $i
iconv -f iso-8859-1 -t utf-8 $f |sed 's|\r||g' > $f.utf8
touch -c -r $f $f.utf8
mv $f.utf8 $f
done
%build
%configure --enable-terminal-title --enable-csv2yapet --enable-pwgen --disable-build-doc --disable-source-doc --disable-install-doc
make %{?_smp_mflags} CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}"
%configure --enable-terminal-title \
--enable-csv2yapet \
--enable-pwgen \
--disable-build-doc \
--disable-source-doc \
--disable-install-doc
make CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" %{?_smp_mflags}
%install
rm -rf %{buildroot}
make install INSTALL="install -p" DESTDIR=%{buildroot}
rm -rf %{buildroot}/%{_datadir}/applications/
make install DESTDIR=%{buildroot}
# Console running is Ok.
rm -frv %{buildroot}%{_datadir}/applications/
%find_lang %{name}
%find_lang libyacurs
%clean
rm -rf %{buildroot}
%files -f %{name}.lang
%defattr(-,root,root,-)
%files -f %{name}.lang -f libyacurs.lang
%doc AUTHORS COPYING DESIGN LICENSE NEWS README THANKS TODO
%{_bindir}/%{name}
%{_bindir}/csv2%{name}
%{_bindir}/*
%{_mandir}/man*/*%{name}*
%changelog
* Fri Aug 05 2011 Simon Wesp <cassmodiah@fedoraproject.org> 0.7-1
- New Upstream Release
* Thu Feb 27 2014 Christopher Meng <rpm@cicku.me> - 1.0-1
- Update to 1.0
* Sun Oct 12 2009 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.6-2
* Sun Nov 14 2010 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.7-1
- New upstream release
* Mon Oct 12 2009 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.6-2
- Correct License and patch integration
- Add LICENSE to DOC
* Sun Oct 12 2009 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.6-1
* Mon Oct 12 2009 Simon Wesp <cassmdodiah@fedoraproject.org> - 0.6-1
- Initial Package build