From 995a7f613ee594006b37dff61bdf0b1e4e0c6636 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Nov 2013 23:12:15 -0600 Subject: [PATCH 1/9] 4.11.90 --- .gitignore | 1 + kdegraphics-mobipocket.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d5ae709..64fcd36 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /kdegraphics-mobipocket-4.11.1.tar.xz /kdegraphics-mobipocket-4.11.2.tar.xz /kdegraphics-mobipocket-4.11.3.tar.xz +/kdegraphics-mobipocket-4.11.90.tar.xz diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index ea5eca6..7386ee9 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,6 +1,6 @@ Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files -Version: 4.11.3 +Version: 4.11.90 Release: 1%{?dist} License: GPLv2+ @@ -65,6 +65,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okularAppli %changelog +* Sat Nov 16 2013 Rex Dieter - 4.11.90-1 +- 4.11.90 + * Sat Nov 02 2013 Rex Dieter - 4.11.3-1 - 4.11.3 diff --git a/sources b/sources index d758ad4..959eefc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -35e925429931cc41295924d2c158e59d kdegraphics-mobipocket-4.11.3.tar.xz +66d0e3dcb2ba04867cb564ba075d7fb6 kdegraphics-mobipocket-4.11.90.tar.xz From 419b5f8aa7c0ce38b62c644def5ba69432bae869 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 16 Nov 2013 14:22:28 -0600 Subject: [PATCH 2/9] qmobipocket(-devel) subpkgs --- kdegraphics-mobipocket.spec | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index 7386ee9..c5ddc34 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -15,11 +15,10 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar BuildRequires: desktop-file-utils BuildRequires: kdelibs4-devel >= %{version} -BuildRequires: okular-devel >= %{version} BuildRequires: pkgconfig(libstreams) +Requires: qmobipocket%{?_isa} = %{version}-%{release} Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} -Requires: okular-libs%{?_isa}%{?_kde4_version: >= %{_kde4_version}} # when split occurred Conflicts: kdegraphics < 7:4.6.95-10 @@ -31,6 +30,18 @@ Provides: mobipocket = %{version}-%{release} %description %{summary}. +%package -n qmobipocket +Summary: Mobipocket Qt bindings +%description -n qmobipocket +%{summary}. + +%package -n qmobipocket-devel +Summary: Development files for qmobipocket +Requires: qmobipocket%{?_isa} = %{version}-%{release} +%description -n qmobipocket-devel +%{summary}. + + %prep %setup -q @@ -49,19 +60,23 @@ make %{?_smp_mflags} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%check -desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/okularApplication_mobi.desktop - - %files %doc COPYING %{_kde4_libdir}/kde4/mobithumbnail.so -%{_kde4_libdir}/kde4/okularGenerator_mobi.so %{_kde4_libdir}/strigi/strigila_mobi.so -%{_kde4_datadir}/applications/kde4/okularApplication_mobi.desktop -%{_kde4_datadir}/kde4/services/libokularGenerator_mobi.desktop %{_kde4_datadir}/kde4/services/mobithumbnail.desktop -%{_kde4_datadir}/kde4/services/okularMobi.desktop + +%post -n qmobipocket -p /sbin/ldconfig +%postun -n qmobipocket -p /sbin/ldconfig + +%files -n qmobipocket +%{_kde4_libdir}/libqmobipocket.so.1* + +%files -n qmobipocket-devel +%{_kde4_libdir}/libqmobipocket.so +%{_kde4_includedir}/qmobipocket/ +%dir %{_kde4_libdir}/cmake/ +%{_kde4_libdir}/cmake/QMobipocket/ %changelog From a195f59e97ae3d7cb6c1eea66cb89b28630f07fe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 21 Nov 2013 11:31:03 -0600 Subject: [PATCH 3/9] 4.11.95 --- .gitignore | 1 + kdegraphics-mobipocket.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 64fcd36..5cba17a 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /kdegraphics-mobipocket-4.11.2.tar.xz /kdegraphics-mobipocket-4.11.3.tar.xz /kdegraphics-mobipocket-4.11.90.tar.xz +/kdegraphics-mobipocket-4.11.95.tar.xz diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index c5ddc34..0c2f318 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,6 +1,6 @@ Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files -Version: 4.11.90 +Version: 4.11.95 Release: 1%{?dist} License: GPLv2+ @@ -80,6 +80,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Nov 21 2013 Rex Dieter - 4.11.95-1 +- 4.11.95 + * Sat Nov 16 2013 Rex Dieter - 4.11.90-1 - 4.11.90 diff --git a/sources b/sources index 959eefc..6b2b274 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66d0e3dcb2ba04867cb564ba075d7fb6 kdegraphics-mobipocket-4.11.90.tar.xz +ebc309acae6fe708a637690e5793542d kdegraphics-mobipocket-4.11.95.tar.xz From dfeb0aef661cc3d0606f8ef3c3cb5ebc0805a102 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 1 Dec 2013 06:30:06 -0600 Subject: [PATCH 4/9] 4.11.97 --- .gitignore | 1 + kdegraphics-mobipocket.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5cba17a..80f602e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /kdegraphics-mobipocket-4.11.3.tar.xz /kdegraphics-mobipocket-4.11.90.tar.xz /kdegraphics-mobipocket-4.11.95.tar.xz +/kdegraphics-mobipocket-4.11.97.tar.xz diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index 0c2f318..f09a9bc 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,6 +1,6 @@ Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files -Version: 4.11.95 +Version: 4.11.97 Release: 1%{?dist} License: GPLv2+ @@ -80,6 +80,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sun Dec 01 2013 Rex Dieter - 4.11.97-1 +- 4.11.97 + * Thu Nov 21 2013 Rex Dieter - 4.11.95-1 - 4.11.95 diff --git a/sources b/sources index 6b2b274..9df1cce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ebc309acae6fe708a637690e5793542d kdegraphics-mobipocket-4.11.95.tar.xz +131332fcc474297bb89b360b2cfb169f kdegraphics-mobipocket-4.11.97.tar.xz From 95a80f9c7f46c1e7abd278592cafd32d6240bbdc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 18 Dec 2013 16:11:12 -0600 Subject: [PATCH 5/9] 4.12.0 --- .gitignore | 1 + kdegraphics-mobipocket.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 80f602e..61eb488 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /kdegraphics-mobipocket-4.11.90.tar.xz /kdegraphics-mobipocket-4.11.95.tar.xz /kdegraphics-mobipocket-4.11.97.tar.xz +/kdegraphics-mobipocket-4.12.0.tar.xz diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index f09a9bc..8959e8f 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,6 +1,6 @@ Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files -Version: 4.11.97 +Version: 4.12.0 Release: 1%{?dist} License: GPLv2+ @@ -80,6 +80,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Dec 18 2013 Rex Dieter - 4.12.0-1 +- 4.12.0 + * Sun Dec 01 2013 Rex Dieter - 4.11.97-1 - 4.11.97 diff --git a/sources b/sources index 9df1cce..8c05f8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -131332fcc474297bb89b360b2cfb169f kdegraphics-mobipocket-4.11.97.tar.xz +05b6ced8e24db4c1812d85bddd01eeaa kdegraphics-mobipocket-4.12.0.tar.xz From da0875cf026ecb07e95a4bc25bb3f22999416a17 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 30 Dec 2013 18:37:17 -0600 Subject: [PATCH 6/9] qmobipocket_kde4_includes_hint.patch --- ...ocket-4.12.0-qmobipocket_kde4_includes_hint.patch | 12 ++++++++++++ kdegraphics-mobipocket.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch diff --git a/kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch b/kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch new file mode 100644 index 0000000..cf74ca5 --- /dev/null +++ b/kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch @@ -0,0 +1,12 @@ +diff -up kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake.kde_includes_hint kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake +--- kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake.kde_includes_hint 2013-11-04 14:42:18.000000000 -0600 ++++ kdegraphics-mobipocket-4.12.0/QMobipocketConfig.cmake 2013-12-30 18:35:15.532983870 -0600 +@@ -5,7 +5,7 @@ get_filename_component( _currentDir ${_ + + # find the full paths to the library and the includes: + find_path(QMOBIPOCKET_INCLUDE_DIR qmobipocket/mobipocket.h +- HINTS ${_currentDir}/include ++ HINTS ${_currentDir}/include ${KDE4_INCLUDE_DIR} + NO_DEFAULT_PATH) + + find_library(QMOBIPOCKET_LIBRARY qmobipocket diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index 8959e8f..a897f30 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,7 +1,7 @@ Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files Version: 4.12.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://projects.kde.org/projects/kde/kdegraphics/mobipocket @@ -13,6 +13,9 @@ URL: https://projects.kde.org/projects/kde/kdegraphics/mobipocket %endif Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +## upstreamable patches +Patch50: kdegraphics-mobipocket-4.12.0-qmobipocket_kde4_includes_hint.patch + BuildRequires: desktop-file-utils BuildRequires: kdelibs4-devel >= %{version} BuildRequires: pkgconfig(libstreams) @@ -46,6 +49,8 @@ Requires: qmobipocket%{?_isa} = %{version}-%{release} %prep %setup -q +%patch50 -p1 -b .qmobipocket_kde4_includes_hint + %build mkdir -p %{_target_platform} @@ -80,6 +85,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Dec 30 2013 Rex Dieter - 4.12.0-2 +- qmobipocket_kde4_includes_hint.patch + * Wed Dec 18 2013 Rex Dieter - 4.12.0-1 - 4.12.0 From 49c3324712be093e4d09efb5a626ebeb20ea3b1e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Jan 2014 09:58:10 -0600 Subject: [PATCH 7/9] 4.12.1 --- .gitignore | 1 + kdegraphics-mobipocket.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 61eb488..866860d 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /kdegraphics-mobipocket-4.11.95.tar.xz /kdegraphics-mobipocket-4.11.97.tar.xz /kdegraphics-mobipocket-4.12.0.tar.xz +/kdegraphics-mobipocket-4.12.1.tar.xz diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index a897f30..3edfce9 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,7 +1,7 @@ Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files -Version: 4.12.0 -Release: 2%{?dist} +Version: 4.12.1 +Release: 1%{?dist} License: GPLv2+ URL: https://projects.kde.org/projects/kde/kdegraphics/mobipocket @@ -85,6 +85,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Jan 10 2014 Rex Dieter - 4.12.1-1 +- 4.12.1 + * Mon Dec 30 2013 Rex Dieter - 4.12.0-2 - qmobipocket_kde4_includes_hint.patch diff --git a/sources b/sources index 8c05f8d..7387803 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05b6ced8e24db4c1812d85bddd01eeaa kdegraphics-mobipocket-4.12.0.tar.xz +2d9758e0ece0bbe580a8a6a3674f5aa3 kdegraphics-mobipocket-4.12.1.tar.xz From 01b58d5bd28bae1121cd04c56a591f28121d9102 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 31 Jan 2014 08:23:45 -0600 Subject: [PATCH 8/9] 4.12.2 --- .gitignore | 1 + kdegraphics-mobipocket.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 866860d..06c90d2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /kdegraphics-mobipocket-4.11.97.tar.xz /kdegraphics-mobipocket-4.12.0.tar.xz /kdegraphics-mobipocket-4.12.1.tar.xz +/kdegraphics-mobipocket-4.12.2.tar.xz diff --git a/kdegraphics-mobipocket.spec b/kdegraphics-mobipocket.spec index 3edfce9..557364e 100644 --- a/kdegraphics-mobipocket.spec +++ b/kdegraphics-mobipocket.spec @@ -1,6 +1,6 @@ Name: kdegraphics-mobipocket Summary: A collection of plugins to handle mobipocket files -Version: 4.12.1 +Version: 4.12.2 Release: 1%{?dist} License: GPLv2+ @@ -85,6 +85,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Fri Jan 31 2014 Rex Dieter - 4.12.2-1 +- 4.12.2 + * Fri Jan 10 2014 Rex Dieter - 4.12.1-1 - 4.12.1 diff --git a/sources b/sources index 7387803..b432a5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d9758e0ece0bbe580a8a6a3674f5aa3 kdegraphics-mobipocket-4.12.1.tar.xz +6733ad2accad3cc13cd6e922a4ebf867 kdegraphics-mobipocket-4.12.2.tar.xz From ce2b0521d63376f9d8f14a0f600c12dd1fd3dd27 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 31 Jan 2014 08:24:11 -0600 Subject: [PATCH 9/9] old stuff --- .gitignore | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.gitignore b/.gitignore index 06c90d2..2ae7be8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1 @@ -/kdegraphics-mobipocket-4.8.5.tar.xz -/kdegraphics-mobipocket-4.9.1.tar.xz -/kdegraphics-mobipocket-4.9.2.tar.xz -/kdegraphics-mobipocket-4.9.3.tar.xz -/kdegraphics-mobipocket-4.9.4.tar.xz -/kdegraphics-mobipocket-4.9.5.tar.xz -/kdegraphics-mobipocket-4.10.1.tar.xz -/kdegraphics-mobipocket-4.10.2.tar.xz -/kdegraphics-mobipocket-4.10.3.tar.xz -/kdegraphics-mobipocket-4.10.4.tar.xz -/kdegraphics-mobipocket-4.10.90.tar.xz -/kdegraphics-mobipocket-4.10.95.tar.xz -/kdegraphics-mobipocket-4.10.97.tar.xz -/kdegraphics-mobipocket-4.11.0.tar.xz -/kdegraphics-mobipocket-4.11.1.tar.xz -/kdegraphics-mobipocket-4.11.2.tar.xz -/kdegraphics-mobipocket-4.11.3.tar.xz -/kdegraphics-mobipocket-4.11.90.tar.xz -/kdegraphics-mobipocket-4.11.95.tar.xz -/kdegraphics-mobipocket-4.11.97.tar.xz -/kdegraphics-mobipocket-4.12.0.tar.xz -/kdegraphics-mobipocket-4.12.1.tar.xz /kdegraphics-mobipocket-4.12.2.tar.xz