Hello community, here is the log from the commit of package krename for openSUSE:Factory checked in at 2018-02-16 21:45:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krename (Old) and /work/SRC/openSUSE:Factory/.krename.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krename" Fri Feb 16 21:45:02 2018 rev:34 rq:577160 version:5.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/krename/krename.changes 2016-06-19 12:53:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krename.new/krename.changes 2018-02-16 21:45:03.062268143 +0100 @@ -1,0 +2,13 @@ +Thu Feb 15 13:17:43 UTC 2018 - [email protected] + +- Update to 5.0.0: + * Ported to Qt5 and KDE Frameworks 5 +- Drop no longer necessary patches: + * gcc6-fix.patch + * fix-freetype2-includes.patch + * krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch + * desktop-files.diff +- Let %suse_update_desktop_file add a GenericName instead of using + a patch for that + +------------------------------------------------------------------- Old: ---- desktop-files.diff fix-freetype2-includes.patch gcc6-fix.patch krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch krename-4.0.9.tar.bz2 New: ---- krename-5.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krename.spec ++++++ --- /var/tmp/diff_new_pack.OGeflm/_old 2018-02-16 21:45:04.058232224 +0100 +++ /var/tmp/diff_new_pack.OGeflm/_new 2018-02-16 21:45:04.062232079 +0100 @@ -1,7 +1,7 @@ # # spec file for package krename # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,93 +17,79 @@ Name: krename -Version: 4.0.9 +Version: 5.0.0 Release: 0 -Summary: A Powerful Batch Renamer for KDE +Summary: A Powerful Batch Renamer by KDE License: GPL-2.0+ Group: Productivity/File utilities Url: http://www.krename.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM desktop-files.diff [email protected] -- Make the desktop file KDE and XDG compatible -Patch0: desktop-files.diff +Source0: https://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM servicemenus-files.patch [email protected] -- Make the desktop files KDE and XDG compatible -Patch1: servicemenus-files.patch -# PATCH-FIX-UPSTREAM krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch sf#3256922 [email protected] -- Fix podofo library names cmake check (patch taken from upstream) -Patch2: krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch +Patch0: servicemenus-files.patch # PATCH-FIX-UPSTREAM remove-gplv2-code.diff [email protected] -- Remove GPLv2 only code (only used for self-testing) -Patch3: remove-gplv2-code.diff -# PATCH-FIX-openSUSE tittiatcokeægmail.com -- make sure that the freetype includes are found -Patch4: fix-freetype2-includes.patch -# PATCH-FIX-OPENSUSE gcc6-fix.patch boo#985366 -- fix build with gcc6 -Patch5: gcc6-fix.patch +Patch1: remove-gplv2-code.diff +BuildRequires: extra-cmake-modules BuildRequires: freetype2-devel +BuildRequires: kcompletion-devel +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: ki18n-devel +BuildRequires: kiconthemes-devel +BuildRequires: kio-devel +BuildRequires: kitemviews-devel +BuildRequires: kjobwidgets-devel +BuildRequires: kjs-devel +BuildRequires: kservice-devel +BuildRequires: kwidgetsaddons-devel +BuildRequires: kxmlgui-devel BuildRequires: libexiv2-devel -BuildRequires: libkde4-devel BuildRequires: libpodofo-devel -%if %suse_version > 1200 -BuildRequires: pkgconfig(taglib) -%else -BuildRequires: taglib-devel +%if 0%{?suse_version} >= 1500 +# podofo 0.9.5 needs openssl-devel by mistake, should be fixed in 0.9.6 +BuildRequires: openssl-devel %endif -%if 0%{?suse_version} +BuildRequires: pkgconfig BuildRequires: update-desktop-files -%endif +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(taglib) BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description -KRename is a powerful batch renamer for KDE. It allows you to easily rename +KRename is a powerful batch renamer by KDE. It allows you to easily rename hundreds or even more files in one go. The filenames can be created by parts of the original filename, numbering the files or accessing hundreds of informations about the file, like creation date or Exif informations of an image. %prep %setup -q -%patch0 -%patch1 -%patch2 -p1 +%patch0 -p0 # GPLv2 only code, not really needed, lets avoid the license discussion rm -rf src/modeltest.* -%patch3 -%if 0%{?suse_version} > 1310 -%patch4 -p1 -%endif -%patch5 -p1 - -# Remove build time references so build-compare can do its work (fix rpmlint warning "file-contains-date-and-time") -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/main.cpp -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/main.cpp +%patch1 -p0 %build - -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -I%_includedir/freetype2" - -%cmake_kde4 -d build +%cmake_kf5 -d build %make_jobs %install -cd build -%kde4_makeinstall -cd .. - -%if 0%{?suse_version} -%suse_update_desktop_file -r %{name} Qt KDE System FileManager -%endif - -%kde_post_install +%kf5_makeinstall -C build +%suse_update_desktop_file -r -G "Batch File Renamer" org.kde.krename Qt KDE System FileManager %find_lang %{name} %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README TODO -%{_kde4_bindir}/krename -%{_kde4_applicationsdir}/krename.desktop -%{_kde4_iconsdir}/hicolor/*/*/krename.png -%{_kde4_iconsdir}/locolor/*/*/krename.png -%{_kde4_servicesdir}/ServiceMenus/krename_all_nonrec.desktop -%{_kde4_servicesdir}/ServiceMenus/krename_dir_rec.desktop +%doc AUTHORS COPYING README.md TODO +%if 0%{?suse_version} == 1315 && 0%{?sle_version} == 120100 +%dir %{_kf5_appstreamdir} +%endif +%{_kf5_applicationsdir}/org.kde.krename.desktop +%{_kf5_appstreamdir}/org.kde.krename.appdata.xml +%{_kf5_bindir}/krename +%{_kf5_iconsdir}/hicolor/*/apps/krename.png +%{_kf5_iconsdir}/locolor/*/apps/krename.png +%{_kf5_servicesdir}/ServiceMenus/ %changelog ++++++ remove-gplv2-code.diff ++++++ --- /var/tmp/diff_new_pack.OGeflm/_old 2018-02-16 21:45:04.118230060 +0100 +++ /var/tmp/diff_new_pack.OGeflm/_new 2018-02-16 21:45:04.118230060 +0100 @@ -1,13 +1,13 @@ --- src/CMakeLists.txt +++ src/CMakeLists.txt -@@ -45,7 +45,6 @@ - krenametest.cpp - krenametokensorter.cpp - krenamewindow.cpp -- modeltest.cpp - numberdialog.cpp - insertpartfilenamedlg.cpp - threadedlister.cpp +@@ -47,7 +47,6 @@ + krenametest.cpp + krenametokensorter.cpp + krenamewindow.cpp +- modeltest.cpp + numberdialog.cpp + insertpartfilenamedlg.cpp + threadedlister.cpp --- src/krenameimpl.cpp +++ src/krenameimpl.cpp @@ -31,8 +31,6 @@ @@ -16,29 +16,30 @@ -#include "modeltest.h" - - #include <kaction.h> - #include <kapplication.h> - #include <kcmdlineargs.h> -@@ -224,9 +222,6 @@ + #include <kconfig.h> + #include <kiconloader.h> + #include <KFileWidget> +@@ -218,10 +216,6 @@ + { bool gotFilenames = false; - KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); -- if( args->isSet( "test" ) ) -- QTimer::singleShot( 0, this, SLOT( selfTest() ) ); +- if (parser->isSet("test")) { +- QTimer::singleShot(0, this, SLOT(selfTest())); +- } - // Add all recursive directoris - KUrl::List recursiveList; - QStringList optlist = args->getOptionList ( "r" ); -@@ -392,20 +387,6 @@ + QList<QUrl> recursiveList; + QStringList directories = parser->values("r"); +@@ -374,20 +368,6 @@ } } -void KRenameImpl::selfTest() -{ -- KRenameTest* test = new KRenameTest(); -- test->startTest(); -- -- new ModelTest( m_model ); +- KRenameTest *test = new KRenameTest(); +- test->startTest(); +- +- new ModelTest(m_model); - //new ModelTest( m_previewModel ); - - // Make _really_ sure it comes to front @@ -49,10 +50,10 @@ - void KRenameImpl::slotUpdateCount() { - m_window->setCount( m_vector.size() ); + m_window->setCount(m_vector.size()); --- src/krenameimpl.h +++ src/krenameimpl.h -@@ -101,11 +101,6 @@ +@@ -100,11 +100,6 @@ */ void saveConfig(); ++++++ servicemenus-files.patch ++++++ --- /var/tmp/diff_new_pack.OGeflm/_old 2018-02-16 21:45:04.130229627 +0100 +++ /var/tmp/diff_new_pack.OGeflm/_new 2018-02-16 21:45:04.130229627 +0100 @@ -1,7 +1,7 @@ diff -uNr src/servicemenus/krename_all_nonrec.desktop src/servicemenus_new/krename_all_nonrec.desktop --- src/servicemenus/krename_all_nonrec.desktop 2009-09-05 19:13:29.000000000 +0300 +++ src/servicemenus_new/krename_all_nonrec.desktop 2011-01-30 22:08:29.037391236 +0200 -@@ -1,11 +1,11 @@ +@@ -1,10 +1,10 @@ # Sending all kinds of file to Krename [Desktop Entry] Type=Service @@ -10,10 +10,9 @@ -ExcludeServiceTypes=kdedevice/* -Encoding=UTF-8 -Actions=rename -- +X-KDE-ExcludeServiceTypes=kdedevice/* +Actions=rename; -+ + [Desktop Action rename] Exec=krename %U Icon=krename
