- updated to 2.0-alpha6

diff --git a/KeePassX.spec b/KeePassX.spec
index 7e49bad15f2517530e493bade4d21c241e44144f..71e21a7a2996868530c03ff2d96021ef04b5475e 100644 (file)
--- a/KeePassX.spec
+++ b/KeePassX.spec
@@ -1,17 +1,18 @@
 # TODO
 # - forcing our cflags breaks build
+%define pre alpha6
+%define        rel 0.1
 Summary:       KeePassX - Cross Platform Password Manager
 Summary(pl.UTF-8):     KeePassX - Wieloplatformowy zarządca haseł
 Name:          KeePassX
-Version:       0.4.3
-Release:       3
+Version:       2.0
+Release:       0.%{pre}.%{rel}
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://downloads.sourceforge.net/keepassx/keepassx-%{version}.tar.gz
-# Source0-md5: 1df67bb22b2e08df49f09e61d156f508
+#Source0:      http://downloads.sourceforge.net/keepassx/keepassx-%{version}.tar.gz
+Source0:       http://www.keepassx.org/dev/attachments/download/69/keepassx-%{version}-%{pre}.tar.gz
+# Source0-md5: 7c1c3a42aff63abd8db3bc8df6c963f6
 URL:           http://keepassx.sourceforge.net/
-Patch1:                keepassx-0.3.3-gcc43.patch
-Patch2:                keepassx-0.4.3-gcc47.patch
 BuildRequires: ImageMagick
 BuildRequires: Qt3Support-devel >= 4.0
 BuildRequires: QtGui-devel >= 4.0
@@ -45,33 +46,20 @@ zaszyfrowana najlepszymi i najbardziej bezpiecznymi algorytmami
 szyfrowania jakie są do tej pory znane (AES i TwoFish).
 
 %prep
-%setup -q -n keepassx-%{version}
-%patch1 -p0
-%patch2 -p1
+%setup -q -n keepassx-%{version}-%{pre}
 
 %build
-qmake-qt4 \
-       PREFIX=%{_prefix}
-
-%{__make} \
-       CC="%{__cc}" \
-       CXX="%{__cxx}" \
-       _CFLAGS="%{rpmcflags}" \
-       _CXXFLAGS="%{rpmcxxflags}" \
-       %{nil}
-
-# use png icon
-convert share/pixmaps/keepassx.xpm share/pixmaps/keepassx.png
+install -d build
+cd build
+%cmake \
+       ../
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
-       INSTALL_ROOT=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_pixmapsdir}/keepassx.xpm
-cp -p share/pixmaps/keepassx.png $RPM_BUILD_ROOT%{_pixmapsdir}/keepassx.png
 
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/mimelnk
+%{__make} -C build install \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,33 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/keepassx
 %{_datadir}/mime/packages/keepassx.xml
 %{_desktopdir}/keepassx.desktop
-%{_pixmapsdir}/keepassx.png
 %dir %{_datadir}/keepassx
 %{_datadir}/keepassx/icons
-%{_datadir}/keepassx/license.html
-%dir %{_datadir}/keepassx/i18n
-%lang(de) %{_datadir}/keepassx/i18n/keepassx-de_DE.qm
-%lang(es) %{_datadir}/keepassx/i18n/keepassx-es_ES.qm
-%lang(fi) %{_datadir}/keepassx/i18n/keepassx-fi_FI.qm
-%lang(fi) %{_datadir}/keepassx/i18n/qt_fi.qm
-%lang(fr) %{_datadir}/keepassx/i18n/keepassx-fr_FR.qm
-%lang(gl) %{_datadir}/keepassx/i18n/keepassx-gl_ES.qm
-%lang(gl) %{_datadir}/keepassx/i18n/qt_gl_ES.qm
-%lang(hu) %{_datadir}/keepassx/i18n/keepassx-hu_HU.qm
-%lang(hu) %{_datadir}/keepassx/i18n/qt_hu.qm
-%lang(it) %{_datadir}/keepassx/i18n/keepassx-it_IT.qm
-%lang(it) %{_datadir}/keepassx/i18n/qt_it.qm
-%lang(ja) %{_datadir}/keepassx/i18n/keepassx-ja_JP.qm
-%lang(nb) %{_datadir}/keepassx/i18n/keepassx-nb_NO.qm
-%lang(nl) %{_datadir}/keepassx/i18n/keepassx-nl_NL.qm
-%lang(nl) %{_datadir}/keepassx/i18n/qt_nl.qm
-%lang(pl) %{_datadir}/keepassx/i18n/keepassx-pl_PL.qm
-%lang(pt) %{_datadir}/keepassx/i18n/keepassx-pt_PT.qm
-%lang(ru) %{_datadir}/keepassx/i18n/keepassx-ru_RU.qm
-%lang(sk) %{_datadir}/keepassx/i18n/keepassx-sk_SK.qm
-%lang(sr) %{_datadir}/keepassx/i18n/keepassx-sr_RS.qm
-%lang(sr) %{_datadir}/keepassx/i18n/qt_sr.qm
-%lang(tr) %{_datadir}/keepassx/i18n/keepassx-tr_TR.qm
-%lang(tr) %{_datadir}/keepassx/i18n/qt_tr.qm
-%lang(uk) %{_datadir}/keepassx/i18n/keepassx-uk_UA.qm
-%lang(zh_CN) %{_datadir}/keepassx/i18n/keepassx-zh_CN.qm
+%dir %{_libdir}/keepassx
+%attr(755,root,root) %{_libdir}/keepassx/libkeepassx-autotype-x11.so
+%{_iconsdir}/hicolor/*x*/apps/keepassx.png
+%{_iconsdir}/hicolor/*x*/mimetypes/application-x-keepassx.png
+%{_iconsdir}/hicolor/scalable/apps/keepassx.svgz

diff --git a/keepassx-0.3.3-gcc43.patch b/keepassx-0.3.3-gcc43.patch
deleted file mode 100644 (file)
index f934b89..0000000
--- a/keepassx-0.3.3-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ./src/lib/random.cpp.gcc43 ./src/lib/random.cpp
---- ./src/lib/random.cpp.gcc43 2008-05-10 11:00:47.000000000 +0200
-+++ ./src/lib/random.cpp       2008-08-23 09:28:46.000000000 +0200
-@@ -19,6 +19,7 @@
-  ***************************************************************************/
- 
- #include "random.h"
-+#include <cstdlib>
- 
- 
- #if defined(Q_WS_X11) || defined(Q_WS_MAC)

diff --git a/keepassx-0.4.3-gcc47.patch b/keepassx-0.4.3-gcc47.patch
deleted file mode 100644 (file)
index 6593505..0000000
--- a/keepassx-0.4.3-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up keepassx-0.4.3/src/lib/random.cpp.gcc47 keepassx-0.4.3/src/lib/random.cpp
---- keepassx-0.4.3/src/lib/random.cpp.gcc47    2012-03-30 18:17:25.913476536 -0400
-+++ keepassx-0.4.3/src/lib/random.cpp  2012-03-30 18:17:33.346409646 -0400
-@@ -20,6 +20,7 @@
- 
- #include "random.h"
- #include <cstdlib>
-+#include <unistd.h>
- 
- 
- #if defined(Q_WS_X11) || defined(Q_WS_MAC)