up to 3.1.1

diff --git a/tellico-desktop.patch b/tellico-desktop.patch
deleted file mode 100644 (file)
index 09d6022..0000000
--- a/tellico-desktop.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- tellico-1.3/x-tellico.desktop~     2008-01-30 07:03:59.000000000 +0200
-+++ tellico-1.3/x-tellico.desktop      2008-02-25 00:53:47.291474232 +0200
-@@ -7,5 +7,5 @@
- Icon=application-x-tellico
- MimeType=application/x-tellico
- Patterns=*.bc;*.tc;
--Type=MimeType;
-+Type=MimeType
- X-KDE-AutoEmbed=false

diff --git a/tellico.spec b/tellico.spec
index 975671a2a3e60ee814e00d22d79845d7f016d69b..3a925013001cc6f1ad458ab70f25706f10a11030 100644 (file)
--- a/tellico.spec
+++ b/tellico.spec
@@ -2,27 +2,49 @@
 # Conditional build:
 %bcond_with    webcam  # build with webcam barcode recognition
 #
+%define                qt_ver  5.4.0
 Summary:       A collection manager
 Summary(pl.UTF-8):     Zarządca zbiorów wideo, audio i książek
 Name:          tellico
-Version:       2.3.8
-Release:       2
+Version:       3.1.1
+Release:       1
 License:       GPL v3
 Group:         X11/Applications
-Source0:       http://tellico-project.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 3f85002f6f369bdcf72ac7499d39297a
-Patch1:                %{name}-desktop.patch
-Patch2:                libkcddb.patch
+Source0:       http://tellico-project.org/files/%{name}-%{version}.tar.xz
+# Source0-md5: 8c503a21b12d5bfc62f55b287855fa6e
 URL:           http://tellico-project.org/
-BuildRequires: cmake
+BuildRequires: Qt5Core-devel >= %{qt_ver}
+BuildRequires: Qt5DBus-devel >= %{qt_ver}
+BuildRequires: Qt5Network-devel >= %{qt_ver}
+BuildRequires: Qt5Test-devel >= %{qt_ver}
+BuildRequires: Qt5Widgets-devel >= %{qt_ver}
+BuildRequires: Qt5Xml-devel >= %{qt_ver}
+BuildRequires: cmake >= 2.8.12
 BuildRequires: exempi-devel
-BuildRequires: kde4-kdepimlibs-devel
-BuildRequires: kde4-libksane-devel
-BuildRequires: kde4-libkcddb-devel
+BuildRequires: kf5-extra-cmake-modules >= 5.19
+BuildRequires: kf5-karchive-devel
+BuildRequires: kf5-kcodecs-devel
+BuildRequires: kf5-kconfig-devel
+BuildRequires: kf5-kconfigwidgets-devel
+BuildRequires: kf5-kcoreaddons-devel
+BuildRequires: kf5-kcrash-devel
+BuildRequires: kf5-kdoctools-devel
+BuildRequires: kf5-kguiaddons-devel
+BuildRequires: kf5-khtml-devel
+BuildRequires: kf5-ki18n-devel
+BuildRequires: kf5-kiconthemes-devel
+BuildRequires: kf5-kitemmodels-devel
+BuildRequires: kf5-kjobwidgets-devel
+BuildRequires: kf5-kio-devel
+BuildRequires: kf5-kwallet-devel
+BuildRequires: kf5-kwidgetsaddons-devel
+BuildRequires: kf5-kwindowsystem-devel
+BuildRequires: kf5-kxmlgui-devel
+BuildRequires: kf5-solid-devel
 BuildRequires: libxml2-devel
 BuildRequires: libxml2-progs
 BuildRequires: libxslt-devel >= 1.0.19
-BuildRequires: poppler-Qt-devel
+BuildRequires: poppler-qt5-devel
 BuildRequires: qimageblitz-devel
 BuildRequires: qjson-devel
 BuildRequires: rpmbuild(macros) >= 1.129
@@ -30,6 +52,11 @@ BuildRequires:       shared-desktop-ontologies-devel
 BuildRequires: soprano-devel
 BuildRequires: taglib-devel
 BuildRequires: yaz-devel
+Requires:      Qt5Core >= %{qt_ver}
+Requires:      Qt5DBus >= %{qt_ver}
+Requires:      Qt5Network >= %{qt_ver}
+Requires:      Qt5Widgets >= %{qt_ver}
+Requires:      Qt5Xml >= %{qt_ver}
 Requires:      desktop-file-utils
 Requires:      libxslt >= 1.0.19
 Obsoletes:     bookcase
@@ -45,8 +72,6 @@ księgozbiorów, archiwów wideo i audio.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 %cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
@@ -61,7 +86,7 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
        kde_htmldir=%{_kdedocdir} \
        kde_libs_htmldir=%{_kdedocdir}
 
-rm -rf $RPM_BUILD_ROOT/nogo
+rm -r $RPM_BUILD_ROOT%{_docdir}
 
 %find_lang %{name} --with-kde
 
@@ -80,14 +105,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/*
-%{_datadir}/apps/kconf_update/%{name}-rename.upd
-%{_datadir}/apps/kconf_update/tellico.upd
-%{_datadir}/apps/kconf_update/tellico-1-3-update.pl
-%{_datadir}/apps/%{name}
-%{_datadir}/config/tellicorc
-%{_datadir}/config/tellico-script.knsrc
-%{_datadir}/config/tellico-template.knsrc
+/etc/xdg/tellicorc
+/etc/xdg/tellico-script.knsrc
+/etc/xdg/tellico-template.knsrc
+%{_datadir}/kconf_update/%{name}-rename.upd
+%{_datadir}/kconf_update/tellico.upd
+%{_datadir}/kconf_update/tellico-1-3-update.pl
+%{_datadir}/%{name}
 %{_datadir}/config.kcfg/tellico_config.kcfg
 %{_datadir}/mime/packages/*.xml
-%{_desktopdir}/kde4/%{name}.desktop
+%{_datadir}/kxmlgui5/tellico
+%{_datadir}/metainfo/org.kde.tellico.appdata.xml
+%{_desktopdir}/org.kde.tellico.desktop
 %{_iconsdir}/*/*/*/*.png