Hello community, here is the log from the commit of package thunar for openSUSE:Factory checked in at Mon Jul 25 08:55:38 CEST 2011.
-------- --- thunar/thunar.changes 2011-05-17 17:14:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/thunar/thunar.changes 2011-07-24 20:53:59.000000000 +0200 @@ -1,0 +2,22 @@ +Sun Jul 24 18:52:26 UTC 2011 - [email protected] + +- added thunarx-refrence-images.tar.bz2 with the images missing + from the source tarball (bxo#7838) + +------------------------------------------------------------------- +Tue Jul 19 15:26:40 UTC 2011 - [email protected] + +- added thunar-allow-custom-helper-dir.patch in order to allow the + installation of helpers under libexecdir +- added patch tags + +------------------------------------------------------------------- +Tue Jul 19 10:44:30 UTC 2011 - [email protected] + +- "update" to version 1.2.2 which is the most recent stable + release whereas 1.3.x is the current development branch; this + version has been released after 1.3.0 and contains additional + bugfixes and translation updates not present in 1.3.0 +- removed obsolete thunar-CVE-2011-1588.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Thunar-1.3.0.tar.bz2 thunar-CVE-2011-1588.patch New: ---- Thunar-1.2.2.tar.bz2 thunar-allow-custom-helper-dir.patch thunarx-refrence-images.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar.spec ++++++ --- /var/tmp/diff_new_pack.lXA2z5/_old 2011-07-25 08:53:48.000000000 +0200 +++ /var/tmp/diff_new_pack.lXA2z5/_new 2011-07-25 08:53:48.000000000 +0200 @@ -18,16 +18,20 @@ Name: thunar -Version: 1.3.0 -Release: 2 +Version: 1.2.2 +Release: 1 License: GPLv2+ Summary: Fast and Easy to Use File Manager for the Xfce Desktop Environment Url: http://thunar.xfce.org/ Group: Productivity/File utilities Source: Thunar-%{version}.tar.bz2 -Source1: %{name}-rpmlintrc +# images missing from the source tarball, see bxo#7838 +Source1: thunarx-refrence-images.tar.bz2 +Source100: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE thunar-fix-desktop-files.patch [email protected] -- Use the system-file-manager stock icon Patch0: %{name}-fix-desktop-files.patch -Patch1: %{name}-CVE-2011-1588.patch +# PATCH-FIX-UPSTREAM thunar-allow-custom-helper-dir.patch [email protected] -- Allow installation of the helpers in a custom location (backported from upstream git) +Patch1: %{name}-allow-custom-helper-dir.patch BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: intltool @@ -47,9 +51,12 @@ BuildRequires: pkgconfig(libxfcegui4-1.0) BuildRequires: update-desktop-files BuildRequires: xfconf +BuildRequires: xfce4-dev-tools Recommends: %{name}-lang = %{version} Recommends: thunar-volman Recommends: tumbler +# thunar 1.3.x is the development branch, the next stable version will be 1.4.0 +Obsoletes: thunar = 1.3.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -63,6 +70,7 @@ License: GPLv2+ Summary: Thunar Extension Library Group: System/Libraries +Obsoletes: libthunarx-2-0 = 1.3.0 %description -n libthunarx-2-0 Thunar a file manager for the Xfce desktop environment which has been designed @@ -79,6 +87,7 @@ Group: Documentation/HTML BuildArch: noarch Requires: %{name} = %{version} +Obsoletes: thunar-doc = 1.3.0 %description doc Thunar a file manager for the Xfce desktop environment which has been designed @@ -107,6 +116,7 @@ Requires: pkgconfig(libxfcegui4-1.0) Requires: %{name} = %{version} Recommends: %{name}-devel-doc = %{version} +Obsoletes: thunar-devel = 1.3.0 %description devel Thunar a file manager for the Xfce desktop environment which has been designed @@ -124,6 +134,7 @@ Group: Documentation/HTML BuildArch: noarch Requires: %{name}-devel = %{version} +Obsoletes: thunar-devel-doc = 1.3.0 %description devel-doc Thunar a file manager for the Xfce desktop environment which has been designed @@ -138,11 +149,12 @@ %lang_package %prep -%setup -q -n Thunar-%{version} +%setup -q -n Thunar-%{version} -a 1 %patch0 -p1 %patch1 -p1 %build +xdt-autogen %configure \ --with-helper-path-prefix=%{_libexecdir} \ --docdir=%{_defaultdocdir}/%{name} \ ++++++ Thunar-1.3.0.tar.bz2 -> Thunar-1.2.2.tar.bz2 ++++++ ++++ 62515 lines of diff (skipped) ++++++ thunar-allow-custom-helper-dir.patch ++++++ diff -ur Thunar-1.2.2.orig/configure.in Thunar-1.2.2/configure.in --- Thunar-1.2.2.orig/configure.in 2011-05-27 00:11:37.000000000 +0200 +++ Thunar-1.2.2/configure.in 2011-07-19 17:32:59.000000000 +0200 @@ -99,6 +99,13 @@ AC_SUBST([THUNAR_VERSION_MINOR]) AC_SUBST([THUNAR_VERSION_MICRO]) +AC_ARG_WITH([helper-path-prefix], + [AC_HELP_STRING([--with-helper-path-prefix=PATH], + [Path prefix under which helper executables will be installed (default: $libdir)])], + [HELPER_PATH_PREFIX="$withval"], + [HELPER_PATH_PREFIX="$libdir"]) +AC_SUBST([HELPER_PATH_PREFIX]) + dnl *********************************************** dnl *** Determine the u32 type required for tdb *** dnl *********************************************** diff -ur Thunar-1.2.2.orig/Makefile.am Thunar-1.2.2/Makefile.am --- Thunar-1.2.2.orig/Makefile.am 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -44,7 +44,7 @@ dist-hook: ChangeLog -thunar_scriptsdir = $(libdir)/Thunar +thunar_scriptsdir = $(HELPER_PATH_PREFIX)/Thunar thunar_scripts_SCRIPTS = \ ThunarBulkRename \ ThunarHelp @@ -74,7 +74,7 @@ Thunar-folder-handler.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) %.desktop.in: %.desktop.in.in - $(AM_V_GEN) sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ + $(AM_V_GEN) sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ diff -ur Thunar-1.2.2.orig/plugins/thunar-sendto-email/Makefile.am Thunar-1.2.2/plugins/thunar-sendto-email/Makefile.am --- Thunar-1.2.2.orig/plugins/thunar-sendto-email/Makefile.am 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/plugins/thunar-sendto-email/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -10,7 +10,7 @@ $(PLATFORM_CPPFLAGS) thunar_sendto_emaildir = \ - $(libdir)/Thunar + $(HELPER_PATH_PREFIX)/Thunar thunar_sendto_email_PROGRAMS = \ thunar-sendto-email @@ -30,7 +30,7 @@ desktop_in_in_files = thunar-sendto-email.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) %.desktop.in: %.desktop.in.in - sed -e "s,\@libdir\@,$(libdir),g" < $< > $@ + sed -e "s,\@HELPERDIR\@,$(HELPER_PATH_PREFIX),g" < $< > $@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ diff -ur Thunar-1.2.2.orig/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in Thunar-1.2.2/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in --- Thunar-1.2.2.orig/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in 2011-07-19 17:32:59.000000000 +0200 @@ -3,4 +3,4 @@ Version=1.0 _Name=Mail Recipient Icon=internet-mail -Exec=@libdir@/Thunar/thunar-sendto-email %F +Exec=@HELPERDIR@/Thunar/thunar-sendto-email %F diff -ur Thunar-1.2.2.orig/plugins/thunar-wallpaper/Makefile.am Thunar-1.2.2/plugins/thunar-wallpaper/Makefile.am --- Thunar-1.2.2.orig/plugins/thunar-wallpaper/Makefile.am 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/plugins/thunar-wallpaper/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -35,7 +35,7 @@ $(GLIB_LIBS) \ $(GTK_LIBS) \ $(LIBX11_LIBS) - + thunar_wallpaper_plugin_la_DEPENDENCIES = \ $(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la diff -ur Thunar-1.2.2.orig/thunar/Makefile.am Thunar-1.2.2/thunar/Makefile.am --- Thunar-1.2.2.orig/thunar/Makefile.am 2011-05-26 23:51:41.000000000 +0200 +++ Thunar-1.2.2/thunar/Makefile.am 2011-07-19 17:32:59.000000000 +0200 @@ -8,6 +8,7 @@ -DEXO_DISABLE_DEPRECATED \ -DG_LOG_DOMAIN=\"Thunar\" \ -DLIBDIR=\"$(libdir)\" \ + -DHELPERDIR=\"$(HELPER_PATH_PREFIX)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ -DTHUNAR_VERSION_API=\"$(THUNAR_VERSION_API)\" \ -DSN_API_NOT_YET_FROZEN \ diff -ur Thunar-1.2.2.orig/thunar/thunar-dialogs.c Thunar-1.2.2/thunar/thunar-dialogs.c --- Thunar-1.2.2.orig/thunar/thunar-dialogs.c 2011-05-26 23:51:41.000000000 +0200 +++ Thunar-1.2.2/thunar/thunar-dialogs.c 2011-07-19 17:32:59.000000000 +0200 @@ -349,7 +349,7 @@ screen = thunar_util_parse_parent (parent, NULL); /* generate the command for the documentation browser */ - command = g_strdup (LIBDIR G_DIR_SEPARATOR_S "Thunar" G_DIR_SEPARATOR_S "ThunarHelp"); + command = g_strdup (HELPERDIR G_DIR_SEPARATOR_S "Thunar" G_DIR_SEPARATOR_S "ThunarHelp"); /* check if a page is given */ if (G_UNLIKELY (page != NULL)) diff -ur Thunar-1.2.2.orig/Thunar-bulk-rename.desktop.in.in Thunar-1.2.2/Thunar-bulk-rename.desktop.in.in --- Thunar-1.2.2.orig/Thunar-bulk-rename.desktop.in.in 2011-05-26 23:51:40.000000000 +0200 +++ Thunar-1.2.2/Thunar-bulk-rename.desktop.in.in 2011-07-19 17:32:59.000000000 +0200 @@ -2,7 +2,7 @@ _Name=Bulk Rename _Comment=Rename Multiple Files _GenericName=Bulk Rename -Exec=@libdir@/Thunar/ThunarBulkRename %F +Exec=@HELPERDIR@/Thunar/ThunarBulkRename %F Icon=Thunar Terminal=false StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
