commit gprename for openSUSE:Factory
Hello community, here is the log from the commit of package gprename for openSUSE:Factory checked in at 2014-03-31 20:43:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gprename (Old) and /work/SRC/openSUSE:Factory/.gprename.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gprename" Changes: -------- --- /work/SRC/openSUSE:Factory/gprename/gprename.changes 2013-10-30 15:36:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gprename.new/gprename.changes 2014-03-31 20:43:06.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Mar 26 15:52:50 UTC 2014 - dap.darkness@gmail.com + +- Updated to upstream 20140325: + * Modified: icon file location in gprename.desktop; + * Added: "Permission denied" and "Path doesn't exist" + error message. +- Removed validate-desktopfile.patch as useless. +- Added desktop_icon.patch to prevent 3 build time + and one run time error, see more at spec. +- Added desktop_database_post(un) macros. + +------------------------------------------------------------------- Old: ---- gprename-5.tar.bz2 validate-desktopfile.patch New: ---- desktop_icon.patch gprename-20140325.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gprename.spec ++++++ --- /var/tmp/diff_new_pack.jegVGi/_old 2014-03-31 20:43:07.000000000 +0200 +++ /var/tmp/diff_new_pack.jegVGi/_new 2014-03-31 20:43:08.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gprename # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,18 +16,30 @@ # +%define upstr_ver 20140325 + Name: gprename -Version: 5 +Version: 5.0.%{upstr_ver} Release: 0 -License: GPL-3.0+ Summary: A GTK2 batch renamer for files and directories -Url: http://gprename.sourceforge.net/ +License: GPL-3.0+ Group: Productivity/File utilities +Url: http://gprename.sourceforge.net/ -Source0: http://kent.dl.sourceforge.net/project/gprename/gprename/%{version}/gprename-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE to prevent "W: invalid-desktopfile; unknown value." -Patch0: validate-desktopfile.patch +Source0: http://kent.dl.sourceforge.net/project/gprename/gprename/%{upstr_ver}/gprename-%{upstr_ver}.tar.bz2 +# PATCH-FIX-OPENSUSE to prevent +# 1) "The databases in [/usr/share/applications] +# could not be updated"; +# 2) "install: cannot create regular file +# '/usr/share/icons/gprename.png': Permission denied"; +# 3) "ERROR: Icon file not installed: /home/abuild/ +# /rpmbuild/BUILDROOT/gprename-5.0.20140325-0.x86_64/usr/ +# /share/applications//gprename..desktop (gprename)"; +# 4) "Failed to open file '/usr/share/icons/gprename.png': +# No such file or directory at /usr/bin/gprename line 131." +Patch1: desktop_icon.patch +BuildRequires: desktop-file-utils BuildRequires: update-desktop-files Requires: perl-Gtk2 Requires: perl-gettext @@ -43,13 +55,11 @@ %lang_package %prep -%setup -q -%patch0 - +%setup -q -n %{name}-%{upstr_ver} +%patch1 %build - %install make \ PREFIX=%{_prefix} \ @@ -58,6 +68,19 @@ %suse_update_desktop_file -r %{name} 'Utility;System;FileManager;' %find_lang %{name} +%post +%if 0%{?suse_version} >= 1140 +%desktop_database_post +%else +update-desktop-database &> /dev/null || : +%endif + +%postun +%if 0%{?suse_version} >= 1140 +%desktop_database_postun +%else +update-desktop-database &> /dev/null || : +%endif %files %defattr(-,root,root) @@ -68,10 +91,8 @@ %{_bindir}/%{name} %{_datadir}/applications/%{name}* %doc %{_mandir}/man*/%{name}* -%{_datadir}/pixmaps/%{name} - +%{_datadir}/pixmaps/%{name}* %files lang -f %{name}.lang - %changelog ++++++ desktop_icon.patch ++++++ --- Makefile.orig 2014-03-25 00:06:04.000000000 +0300 +++ Makefile 2014-03-26 18:24:02.435966200 +0300 @@ -26,7 +26,7 @@ perl -ne 's!\@INSTALLDIR\@!$(PREFIX)!g ; print' < bin/gprename > build/gprename perl -ne 's!\@INSTALLDIR\@!$(PREFIX)!g ; print' < bin/gprename.desktop > build/gprename.desktop -install: uninstall build +install: build # Compile all .po files to .mo msgfmt -o build/locale/ca.mo locale/ca.po msgfmt -o build/locale/de.mo locale/de.po @@ -45,8 +45,8 @@ # Create directories install -d "$(DESTDIR)" install -d "$(DESTDIR)/bin" - install -d "/usr/share" - install -d "/usr/share/icons" + install -d "$(DESTDIR)/share" + install -d "$(DESTDIR)/share/pixmaps" install -d "$(DESTDIR)/share/applications" install -d "$(DESTDIR)/share/man" install -d "$(DESTDIR)/share/man/man1" @@ -67,7 +67,7 @@ # Copy all files in the filesystem install -m 755 build/gprename "$(DESTDIR)/bin/" install -m 644 gprename-nautilus-actions.xml "$(DESTDIR)/share/applications/" - install -m 644 icon/gprename.png "/usr/share/icons/" + install -m 644 icon/gprename.png "$(DESTDIR)/share/pixmaps/" install -m 644 man/gprename.1 "$(DESTDIR)/share/man/man1/" install -m 644 build/locale/ca.mo "$(DESTDIR)/share/locale/ca/LC_MESSAGES/gprename.mo" install -m 644 build/locale/de.mo "$(DESTDIR)/share/locale/de/LC_MESSAGES/gprename.mo" @@ -82,8 +82,7 @@ install -m 644 build/locale/ru.mo "$(DESTDIR)/share/locale/ru/LC_MESSAGES/gprename.mo" install -m 644 build/locale/sv.mo "$(DESTDIR)/share/locale/sv/LC_MESSAGES/gprename.mo" install -m 644 build/locale/zh_CN.mo "$(DESTDIR)/share/locale/zh_CN/LC_MESSAGES/gprename.mo" - desktop-file-install bin/gprename.desktop - update-desktop-database + desktop-file-install bin/gprename.desktop --dir="$(DESTDIR)/share/applications/" @echo "Installation completed." uninstall: clean --- bin/gprename.orig 2014-03-26 01:47:15.000000000 +0300 +++ bin/gprename 2014-03-26 18:37:12.156966200 +0300 @@ -61,7 +61,7 @@ # set the locale setlocale(LC_ALL, ''); -bindtextdomain( 'gprename', '/usr/local/share/locale'); +bindtextdomain( 'gprename', '/usr/share/locale'); textdomain( 'gprename' ); # Change the font to courier new for the Tree and the SimpleList @@ -127,7 +127,7 @@ $window->add_accel_group( $accel_group ); # Set the window icon -my $icon = '/usr/share/icons/gprename.png'; +my $icon = '/usr/share/pixmaps/gprename.png'; my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file( $icon ); $window->set_icon( $pixbuf ); @@ -1440,7 +1440,7 @@ $buffer->create_tag( 'big', size => 15 * PANGO_SCALE ); $buffer->create_tag( 'italic', style => 'italic' ); my $iter = $buffer->get_start_iter; - my $icon = '/usr/local/share/pixmaps/gprename/gprename.png'; + my $icon = '/usr/share/pixmaps/gprename.png'; my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file( $icon ); $buffer->insert_pixbuf ($iter, $pixbuf); --- build/gprename.orig 2014-03-26 01:47:15.000000000 +0300 +++ build/gprename 2014-03-26 18:37:12.156966200 +0300 @@ -61,7 +61,7 @@ # set the locale setlocale(LC_ALL, ''); -bindtextdomain( 'gprename', '/usr/local/share/locale'); +bindtextdomain( 'gprename', '/usr/share/locale'); textdomain( 'gprename' ); # Change the font to courier new for the Tree and the SimpleList @@ -127,7 +127,7 @@ $window->add_accel_group( $accel_group ); # Set the window icon -my $icon = '/usr/share/icons/gprename.png'; +my $icon = '/usr/share/pixmaps/gprename.png'; my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file( $icon ); $window->set_icon( $pixbuf ); @@ -1440,7 +1440,7 @@ $buffer->create_tag( 'big', size => 15 * PANGO_SCALE ); $buffer->create_tag( 'italic', style => 'italic' ); my $iter = $buffer->get_start_iter; - my $icon = '/usr/local/share/pixmaps/gprename/gprename.png'; + my $icon = '/usr/share/pixmaps/gprename.png'; my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file( $icon ); $buffer->insert_pixbuf ($iter, $pixbuf); ++++++ gprename-5.tar.bz2 -> gprename-20140325.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gprename-5/Makefile new/gprename-20140325/Makefile --- old/gprename-5/Makefile 2013-06-29 01:47:42.000000000 +0200 +++ new/gprename-20140325/Makefile 2014-03-24 22:06:04.000000000 +0100 @@ -45,8 +45,8 @@ # Create directories install -d "$(DESTDIR)" install -d "$(DESTDIR)/bin" - install -d "$(DESTDIR)/share/pixmaps" - install -d "$(DESTDIR)/share/pixmaps/gprename" + install -d "/usr/share" + install -d "/usr/share/icons" install -d "$(DESTDIR)/share/applications" install -d "$(DESTDIR)/share/man" install -d "$(DESTDIR)/share/man/man1" @@ -65,30 +65,30 @@ install -d "$(DESTDIR)/share/locale/zh_CN/LC_MESSAGES" # Copy all files in the filesystem - install -m 755 build/gprename "$(DESTDIR)/bin/" - install -m 644 build/gprename.desktop "$(DESTDIR)/share/applications/" - install -m 644 gprename-nautilus-actions.xml "$(DESTDIR)/share/applications/" - install -m 644 icon/* "$(DESTDIR)/share/pixmaps/gprename" - install -m 644 man/gprename.1 "$(DESTDIR)/share/man/man1/" - install -m 644 build/locale/ca.mo "$(DESTDIR)/share/locale/ca/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/de.mo "$(DESTDIR)/share/locale/de/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/es.mo "$(DESTDIR)/share/locale/es/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/et.mo "$(DESTDIR)/share/locale/et/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/fr.mo "$(DESTDIR)/share/locale/fr/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/id.mo "$(DESTDIR)/share/locale/id/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/it.mo "$(DESTDIR)/share/locale/it/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/nl.mo "$(DESTDIR)/share/locale/nl/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/pl.mo "$(DESTDIR)/share/locale/pl/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/pt_BR.mo "$(DESTDIR)/share/locale/pt_BR/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/ru.mo "$(DESTDIR)/share/locale/ru/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/sv.mo "$(DESTDIR)/share/locale/sv/LC_MESSAGES/gprename.mo" - install -m 644 build/locale/zh_CN.mo "$(DESTDIR)/share/locale/zh_CN/LC_MESSAGES/gprename.mo" - + install -m 755 build/gprename "$(DESTDIR)/bin/" + install -m 644 gprename-nautilus-actions.xml "$(DESTDIR)/share/applications/" + install -m 644 icon/gprename.png "/usr/share/icons/" + install -m 644 man/gprename.1 "$(DESTDIR)/share/man/man1/" + install -m 644 build/locale/ca.mo "$(DESTDIR)/share/locale/ca/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/de.mo "$(DESTDIR)/share/locale/de/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/es.mo "$(DESTDIR)/share/locale/es/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/et.mo "$(DESTDIR)/share/locale/et/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/fr.mo "$(DESTDIR)/share/locale/fr/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/id.mo "$(DESTDIR)/share/locale/id/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/it.mo "$(DESTDIR)/share/locale/it/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/nl.mo "$(DESTDIR)/share/locale/nl/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/pl.mo "$(DESTDIR)/share/locale/pl/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/pt_BR.mo "$(DESTDIR)/share/locale/pt_BR/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/ru.mo "$(DESTDIR)/share/locale/ru/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/sv.mo "$(DESTDIR)/share/locale/sv/LC_MESSAGES/gprename.mo" + install -m 644 build/locale/zh_CN.mo "$(DESTDIR)/share/locale/zh_CN/LC_MESSAGES/gprename.mo" + desktop-file-install bin/gprename.desktop + update-desktop-database @echo "Installation completed." uninstall: clean rm -f "$(DESTDIR)/bin/gprename" - rm -f "$(DESTDIR)/share/applications/gprename.desktop" + rm -f "/usr/share/applications/gprename.desktop" rm -f "$(DESTDIR)/share/applications/gprename-nautilus-actions.xml" rm -f "$(DESTDIR)/share/man/man1/gprename.1" rm -f "$(DESTDIR)/share/locale/ca/LC_MESSAGES/gprename.mo" @@ -104,7 +104,8 @@ rm -f "$(DESTDIR)/share/locale/ru/LC_MESSAGES/gprename.mo" rm -f "$(DESTDIR)/share/locale/sv/LC_MESSAGES/gprename.mo" rm -f "$(DESTDIR)/share/locale/zh_CN/LC_MESSAGES/gprename.mo" - rm -fr "$(DESTDIR)/share/pixmaps/gprename" + rm -fr "/usr/share/icons/gprename" + update-desktop-database clean: rm -rf build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gprename-5/README.TXT new/gprename-20140325/README.TXT --- old/gprename-5/README.TXT 2013-06-29 11:07:16.000000000 +0200 +++ new/gprename-20140325/README.TXT 2014-03-25 23:54:26.000000000 +0100 @@ -8,7 +8,7 @@ GPRename is a complete batch renamer for files and directories. -Copyright (C) 2013 gprename-users@lists.sourceforge.net +Copyright (C) 2014 gprename-users@lists.sourceforge.net This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ Download: http://sourceforge.net/project/showfiles.php?group_id=40094 After downloading GPRename, open up a terminal and type these commands: -tar xvjf gprename-X.X.tar.bz2 +tar xvjf gprename-XXXXXXXX.tar.bz2 cd gprename sudo make install @@ -80,23 +80,23 @@ Credits --------------------------------------------------------------------------- - - Albino Riganello Translation: Italian (2.3) + - Albino Riganello Translation: Italian (2.3) - Algimantas Margevičius Translation: Lithuanian (2.7) - - Bart'omiej Gródek Translation: Polish (1.24-2.6) - - Dominik Fretz Patch (<1.00) - - Duane Toler Bugs reports (<1.00) - - Johan Spee Logo, icon, bugs and features (2.1-2.2) - - Jose Oswaldo Translation: Brazilian Portuguese (2.1-2.5) - - Marcin Juszkiewicz Debian package (0.92) - - Martintxo Translation: Spanish (1.21-2.1) - - Marvin Stark Maintainer, Debian packager (2.2-2.5) - - nestor di Logo and icon (1.20-2.0) - - Petter Sundlöf Install script (0.92-1.3) + - Bart'omiej Gródek Translation: Polish (1.24-2.6) + - Dominik Fretz Patch (<1.00) + - Duane Toler Bugs reports (<1.00) + - Johan Spee Logo, icon, bugs and features (2.1-2.2) + - Jose Oswaldo Translation: Brazilian Portuguese (2.1-2.5) + - Marcin Juszkiewicz Debian package (0.92) + - Martintxo Translation: Spanish (1.21-2.1) + - Marvin Stark Maintainer, Debian packager (2.2-2.5) + - nestor di Logo and icon (1.20-2.0) + - Petter Sundlöf Install script (0.92-1.3) - Rudinei Weschenfelder Translation: Brazil (2.6.6) - - Salman Farisy Translation: Indonesian (2.4) - - Tristesse Author (0.90-1.24) - - Wayne E. Nail Bugs and features reports (2.0-2.5) - - Zurd Maintainer (1.0-5) + - Salman Farisy Translation: Indonesian (2.4) + - Tristesse Author (0.90-1.24) + - Wayne E. Nail Bugs and features reports (2.0-2.5) + - Zurd Maintainer (1.0-20140325) --------------------------------------------------------------------------- @@ -133,14 +133,18 @@ Changelog --------------------------------------------------------------------------- +GPRename 20140325 - Zurd +Modified icon file location in gprename.desktop +Added "Permission denied" and "Path doesn't exist" error message + GPRename 5 2013-06-29 - Zurd - Modified the field 'Add numbers starting at' from a maximum of 9,999 to 999,999 +Modified Field 'Add numbers starting at' from a maximum of 9,999 to 999,999 GPRename 4 2013-05-03 - Zurd - Modified the way GPRename rename long filename over 253 characters +Modified How GPRename rename long filename over 253 characters GPRename 3 2013-01-19 - Zurd -Modified Translation : French +Modified Translation : French GPRename 2.7 2012-05-15 - Zurd Added Translation : Lithuanian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gprename-5/bin/gprename new/gprename-20140325/bin/gprename --- old/gprename-5/bin/gprename 2013-06-29 11:11:53.000000000 +0200 +++ new/gprename-20140325/bin/gprename 2014-03-25 23:47:15.000000000 +0100 @@ -2,7 +2,7 @@ # GPRename is a complete batch renamer for files and directories. -# GPRename 4 Copyright (C) 2013 gprename-users@lists.sourceforge.net +# GPRename Copyright (C) 2014 gprename-users@lists.sourceforge.net # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License or @@ -24,6 +24,7 @@ # Linux Filesystem Hierarchy : http://tldp.org/LDP/Linux-Filesystem-Hierarchy/html/usr.html # Tutorial on gettext : http://cpan.uwinnipeg.ca/htdocs/gettext/README.html # Gnu gettext : http://www.gnu.org/software/gettext/ +# .desktop specification : http://www.freedesktop.org/wiki/Howto_desktop_files/ # To create a gprename.po template file : # cd bin @@ -60,7 +61,7 @@ # set the locale setlocale(LC_ALL, ''); -bindtextdomain( 'gprename', '@INSTALLDIR@/share/locale'); +bindtextdomain( 'gprename', '/usr/local/share/locale'); textdomain( 'gprename' ); # Change the font to courier new for the Tree and the SimpleList @@ -126,7 +127,7 @@ $window->add_accel_group( $accel_group ); # Set the window icon -my $icon = '@INSTALLDIR@/share/pixmaps/gprename/gprename.png'; +my $icon = '/usr/share/icons/gprename.png'; my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file( $icon ); $window->set_icon( $pixbuf ); @@ -1439,7 +1440,7 @@ $buffer->create_tag( 'big', size => 15 * PANGO_SCALE ); $buffer->create_tag( 'italic', style => 'italic' ); my $iter = $buffer->get_start_iter; - my $icon = '@INSTALLDIR@/share/pixmaps/gprename/gprename.png'; + my $icon = '/usr/local/share/pixmaps/gprename/gprename.png'; my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file( $icon ); $buffer->insert_pixbuf ($iter, $pixbuf); @@ -1503,7 +1504,12 @@ foreach my $x (@paths) { $path = $path . '/' . $x; if ( -e $path ) { - while ( decode('utf8',$x) ne $tv_tree->get_model->get($iter) and defined $iter ) { + if ( !defined $iter ) { + print "Permission denied for this folder!" . "\n"; + exit; + } + + while ( defined $iter and decode('utf8',$x) ne $tv_tree->get_model->get($iter) ) { $iter = $tv_tree->get_model->iter_next($iter); } if ( $iter ) { @@ -1515,6 +1521,10 @@ } } } + else { + print "Path doesn't exist!" . "\n"; + exit; + } } # List the files/directories diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gprename-5/bin/gprename.desktop new/gprename-20140325/bin/gprename.desktop --- old/gprename-5/bin/gprename.desktop 2013-06-29 01:47:42.000000000 +0200 +++ new/gprename-20140325/bin/gprename.desktop 2014-03-24 21:48:58.000000000 +0100 @@ -1,9 +1,9 @@ [Desktop Entry] -Version=2.6 +Version=1.0 Name=GPRename Comment=To rename files and directories in batch Exec=gprename -Icon=@INSTALLDIR@/share/pixmaps/gprename/gprename.png +Icon=gprename Terminal=false Type=Application -Categories=Utility;FileManager; +Categories=Utility; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gprename-5/build/gprename new/gprename-20140325/build/gprename --- old/gprename-5/build/gprename 2013-06-29 11:10:56.000000000 +0200 +++ new/gprename-20140325/build/gprename 2014-03-25 23:47:23.000000000 +0100 @@ -2,7 +2,7 @@ # GPRename is a complete batch renamer for files and directories. -# GPRename 4 Copyright (C) 2013 gprename-users@lists.sourceforge.net +# GPRename Copyright (C) 2014 gprename-users@lists.sourceforge.net # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License or @@ -24,6 +24,7 @@ # Linux Filesystem Hierarchy : http://tldp.org/LDP/Linux-Filesystem-Hierarchy/html/usr.html # Tutorial on gettext : http://cpan.uwinnipeg.ca/htdocs/gettext/README.html # Gnu gettext : http://www.gnu.org/software/gettext/ +# .desktop specification : http://www.freedesktop.org/wiki/Howto_desktop_files/ # To create a gprename.po template file : # cd bin @@ -90,7 +91,7 @@ my $status_bar_files=0; my $status_bar_dirs=0; my $status_bar_selected=0; -my $str_gprename_version='4'; +my $str_gprename_version='5'; # Hold a list of the Name and New Name column of files or directories # These are filled when calling &preview @@ -126,7 +127,7 @@ $window->add_accel_group( $accel_group ); # Set the window icon -my $icon = '/usr/local/share/pixmaps/gprename/gprename.png'; +my $icon = '/usr/share/icons/gprename.png'; my $pixbuf = Gtk2::Gdk::Pixbuf->new_from_file( $icon ); $window->set_icon( $pixbuf ); @@ -1503,7 +1504,12 @@ foreach my $x (@paths) { $path = $path . '/' . $x; if ( -e $path ) { - while ( decode('utf8',$x) ne $tv_tree->get_model->get($iter) and defined $iter ) { + if ( !defined $iter ) { + print "Permission denied for this folder!" . "\n"; + exit; + } + + while ( defined $iter and decode('utf8',$x) ne $tv_tree->get_model->get($iter) ) { $iter = $tv_tree->get_model->iter_next($iter); } if ( $iter ) { @@ -1515,6 +1521,10 @@ } } } + else { + print "Path doesn't exist!" . "\n"; + exit; + } } # List the files/directories diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gprename-5/build/gprename.desktop new/gprename-20140325/build/gprename.desktop --- old/gprename-5/build/gprename.desktop 2013-06-29 11:10:56.000000000 +0200 +++ new/gprename-20140325/build/gprename.desktop 2014-03-25 23:47:23.000000000 +0100 @@ -1,9 +1,9 @@ [Desktop Entry] -Version=2.6 +Version=1.0 Name=GPRename Comment=To rename files and directories in batch Exec=gprename -Icon=/usr/local/share/pixmaps/gprename/gprename.png +Icon=gprename Terminal=false Type=Application -Categories=Utility;FileManager; +Categories=Utility; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de