Hello community,
here is the log from the commit of package krename for openSUSE:Factory
checked in at Wed Aug 24 15:58:15 CEST 2011.
--------
--- KDE/krename/krename.changes 2011-02-21 23:32:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/krename/krename.changes 2011-08-23 17:28:54.000000000 +0200
@@ -1,0 +2,23 @@
+Tue Aug 23 17:28:40 CEST 2011 - dmueller@suse.de
+
+- remove GPLv2 only code (only used for self-testing)
+
+-------------------------------------------------------------------
+Sat Aug 13 20:16:14 UTC 2011 - asterios.dramis@gmail.com
+
+- Spec file updates:
+ * Changes based on spec-cleaner run.
+ * Changed Group: to Productivity/File utilities.
+ * Updates in Summary: and %description sections.
+ * Added update-desktop-files in Buildrequires:.
+ * Removed support for openSUSE < 11.3.
+ * Removed kde4-krename Provides/Obsoletes entries (not needed anymore).
+ * Fixed rpmlint warning "file-contains-date-and-time".
+ * Minor other updates.
+- Modified the patch for krename.desktop to make the desktop file KDE and XDG
+ compatible.
+- Added a patch for the servicemenus to make them KDE and XDG compatible.
+- Added a patch (taken from Fedora) to fix crash on static initialization.
+- Added a patch (taken from upstream) to fix podofo library names cmake check.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
krename-4.0.7-static-init-crash.patch
krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch
remove-gplv2-code.diff
servicemenus-files.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ krename.spec ++++++
--- /var/tmp/diff_new_pack.dDorTp/_old 2011-08-24 15:51:40.000000000 +0200
+++ /var/tmp/diff_new_pack.dDorTp/_new 2011-08-24 15:51:40.000000000 +0200
@@ -19,68 +19,83 @@
Name: krename
-BuildRequires: libexiv2-devel libkde4-devel taglib-devel
-%if %suse_version > 1120
-BuildRequires: libpodofo-devel
-%endif
-License: GPLv2+
-Group: System/Filesystems
-Summary: A Batch Rename Application
Version: 4.0.7
-Release: 1
-Url: http://www.krename.net
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: %name-%{version}.tar.bz2
+Release: 2
+License: GPL-2.0+
+Summary: A Powerful Batch Renamer for KDE
+Url: http://www.krename.net/
+Group: Productivity/File utilities
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM desktop-files.diff asterios.dramis@gmail.com -- Make the desktop file KDE and XDG compatible
Patch0: desktop-files.diff
-Provides: kde4-krename = 3.9.1
-Obsoletes: kde4-krename <= 3.9.1
+# PATCH-FIX-UPSTREAM servicemenus-files.patch asterios.dramis@gmail.com -- Make the desktop files KDE and XDG compatible
+Patch1: servicemenus-files.patch
+# PATCH-FIX-OPENSUSE krename-4.0.7-static-init-crash.patch rh#684908 asterios.dramis@gmail.com -- Fix crash on static initialization (patch taken from Fedora)
+Patch2: krename-4.0.7-static-init-crash.patch
+# PATCH-FIX-UPSTREAM krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch sf#3256922 asterios.dramis@gmail.com -- Fix podofo library names cmake check (patch taken from upstream)
+Patch3: krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch
+Patch4: remove-gplv2-code.diff
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+BuildRequires: libexiv2-devel
+BuildRequires: libkde4-devel
+BuildRequires: libpodofo-devel
+BuildRequires: taglib-devel
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
%kde4_runtime_requires
%description
-Krename is a very powerful batch file renamer for KDE3. Features
-include: -renaming a list of files based on a set of expressions
--copying and moving a list of files to another directory -converting
-filenames to uppercase or lowercase -adding numbers to filenames
--finding and replacing parts of the filename -renaming MP3 or Ogg
-Vorbis files based on their ID3 tags -setting access and modification
-dates -managing permissions and file ownership -extending krename's
-features with a plug-in API -renaming directories recursively
--supporting KFilePlugins -creating an undo file
-
-
-
-Authors:
---------
- Dominik Seichter
+KRename is a powerful batch renamer for 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
+%patch3 -p1
+# GPLv2 only code, not really needed, lets avoid the license discussion
+rm -rf src/modeltest.*
+%patch4
+
+# 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
%build
- %cmake_kde4 -d build
- %make_jobs
+%cmake_kde4 -d build
+%make_jobs
%install
- cd build
- %makeinstall
- cd ..
-%suse_update_desktop_file -G "Batch File Renamer" krename System FileManager
+cd build
+%kde4_makeinstall
+cd ..
+
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{name} Qt KDE System FileManager
+%endif
+
%kde_post_install
-%find_lang %name
+
+%find_lang %{name}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%files -f %name.lang
-%defattr(-,root,root)
+%files -f %{name}.lang
+%defattr(-,root,root,-)
%doc AUTHORS COPYING README TODO
-/usr/bin/krename
-/usr/share/applications/kde4/krename.desktop
-/usr/share/icons/hicolor/*/apps/krename.png
-/usr/share/icons/hicolor/*/apps/krename.png
-/usr/share/icons/locolor/*/apps/krename.png
-/usr/share/icons/locolor/*/apps/krename.png
-/usr/share/kde4/services/ServiceMenus/*.desktop
+%{_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
%changelog
++++++ desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.dDorTp/_old 2011-08-24 15:51:40.000000000 +0200
+++ /var/tmp/diff_new_pack.dDorTp/_new 2011-08-24 15:51:40.000000000 +0200
@@ -1,10 +1,17 @@
---- src/krename.desktop
-+++ src/krename.desktop
-@@ -3,7 +3,6 @@ Type=Application
- Exec=krename -caption "%c" %i %m %U
- Icon=krename.png
- MiniIcon=krename.png
+--- src/krename.desktop 2007-03-18 18:54:10.000000000 +0200
++++ src/krename.desktop.new 2011-01-30 23:05:11.791019627 +0200
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+ Type=Application
+-Exec=krename -caption "%c" %i %m %U
+-Icon=krename.png
+-MiniIcon=krename.png
-DocPath=krename/index.html
++Exec=krename -caption "%c" %i %U
++Icon=krename
Comment=A batch renamer
Comment[de]=Ein Batch Umbenenner
Terminal=false
+ Name=KRename
++GenericName=Batch File Renamer
+ Categories=Qt;KDE;Utility;
++++++ krename-4.0.7-static-init-crash.patch ++++++
diff -up ./src/plugin.cpp.static-init-crash ./src/plugin.cpp
--- ./src/plugin.cpp.static-init-crash 2011-03-16 16:12:23.000000000 +0100
+++ ./src/plugin.cpp 2011-03-16 16:12:45.000000000 +0100
@@ -19,7 +19,7 @@
#include "tokenhelpdialog.h"
-const QString Plugin::S_TOKEN_SEPARATOR = TokenHelpDialog::S_TOKEN_SEPARATOR;
+const QString Plugin::S_TOKEN_SEPARATOR = ";;";
Plugin::Plugin( PluginLoader* loader )
: m_pluginLoader( loader ), m_enabled( false )
++++++ krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch ++++++
Source: Heiko Becker
Upstream: Submitted, https://sourceforge.net/tracker/?func=detail&aid=3256681&group_id=42805&atid=434230
Reason: Fix FindLIBPODOFO.cmake
diff -urB krename-4.0.7_orig/cmake/modules/FindLIBPODOFO.cmake krename-4.0.7/cmake/modules/FindLIBPODOFO.cmake
--- a/cmake/modules/FindLIBPODOFO.cmake 2011-02-21 23:00:30.000000000 +0100
+++ b/cmake/modules/FindLIBPODOFO.cmake 2011-03-29 10:29:03.606942001 +0200
@@ -23,7 +23,7 @@
ENDIF(LIBPODOFO_H)
FIND_LIBRARY(LIBPODOFO_LIB
- NAMES libpodofo-doc podofo-doc
+ NAMES libpodofo podofo libpodofo-doc podofo-doc
PATHS "${LIBPODOFO_DIR}/lib" "${LIBPODOFO_DIR}/src" "${LIBPODOFO_DIR}")
IF(LIBPODOFO_LIB)
MESSAGE("podofo lib: ${LIBPODOFO_LIB}")
++++++ remove-gplv2-code.diff ++++++
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -45,7 +45,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 @@
#include "threadedlister.h"
#include "tokenhelpdialog.h"
-#include "modeltest.h"
-
#include
#include
#include
@@ -224,9 +222,6 @@
bool gotFilenames = false;
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- if( args->isSet( "test" ) )
- QTimer::singleShot( 0, this, SLOT( selfTest() ) );
-
// Add all recursive directoris
KUrl::List recursiveList;
QStringList optlist = args->getOptionList ( "r" );
@@ -392,20 +387,6 @@
}
}
-void KRenameImpl::selfTest()
-{
- KRenameTest* test = new KRenameTest();
- test->startTest();
-
- new ModelTest( m_model );
- //new ModelTest( m_previewModel );
-
- // Make _really_ sure it comes to front
- test->show();
- test->raise();
- test->activateWindow();
-}
-
void KRenameImpl::slotUpdateCount()
{
m_window->setCount( m_vector.size() );
--- src/krenameimpl.h
+++ src/krenameimpl.h
@@ -101,11 +101,6 @@
*/
void saveConfig();
- /** Start KRename's selftest:
- * I.e several unit tests.
- */
- void selfTest();
-
/** Called when the user clicks the "Add..." button.
* open a dialog to select files for adding to KRename.
*/
++++++ servicemenus-files.patch ++++++
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 @@
# Sending all kinds of file to Krename
[Desktop Entry]
Type=Service
+Name=Rename with KRename
ServiceTypes=KonqPopupMenu/Plugin,all/allfiles,inode/directory
-ExcludeServiceTypes=kdedevice/*
-Encoding=UTF-8
-Actions=rename
-
+X-KDE-ExcludeServiceTypes=kdedevice/*
+Actions=rename;
+
[Desktop Action rename]
Exec=krename %U
Icon=krename
diff -uNr src/servicemenus/krename_dir_rec.desktop src/servicemenus_new/krename_dir_rec.desktop
--- src/servicemenus/krename_dir_rec.desktop 2009-09-05 19:13:29.000000000 +0300
+++ src/servicemenus_new/krename_dir_rec.desktop 2011-01-30 22:08:41.257147523 +0200
@@ -1,10 +1,10 @@
# Sending all kinds of files recursively from a directory to Krename
[Desktop Entry]
Type=Service
+Name=Rename with KRename (with subfolders)
ServiceTypes=KonqPopupMenu/Plugin,inode/directory
-ExcludeServiceTypes=kdedevice/*
-Encoding=UTF-8
-Actions=rename
+X-KDE-ExcludeServiceTypes=kdedevice/*
+Actions=rename;
[Desktop Action rename]
Exec=krename -r %U
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org