Hello community, here is the log from the commit of package thunar for openSUSE:Factory checked in at 2012-04-19 10:40:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/thunar (Old) and /work/SRC/openSUSE:Factory/.thunar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "thunar", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/thunar/thunar.changes 2011-10-25 17:13:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.thunar.new/thunar.changes 2012-04-19 10:40:54.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Mar 27 14:00:07 UTC 2012 - [email protected] + +- specfile cleanup + +------------------------------------------------------------------- +Tue Mar 20 14:54:14 UTC 2012 - [email protected] + +- merged -devel-doc into -devel +- specfile cleanup +- corrected dependencies +- rename thunarx-refrence-images.tar.bz2 to + thunarx-reference-images.tar.bz2 +- removed thunar-sendto-bluetooth.desktop, gnome-bluetooth is + is not in the Xfce pattern any more + +------------------------------------------------------------------- Old: ---- thunar-sendto-bluetooth.desktop thunarx-refrence-images.tar.bz2 New: ---- thunarx-reference-images.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunar.spec ++++++ --- /var/tmp/diff_new_pack.yybkfM/_old 2012-04-19 10:40:56.000000000 +0200 +++ /var/tmp/diff_new_pack.yybkfM/_new 2012-04-19 10:40:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package thunar # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,18 @@ # +%define libname libthunarx-2-0 Name: thunar Version: 1.2.3 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Fast and Easy to Use File Manager for the Xfce Desktop Environment -Url: http://thunar.xfce.org/ +License: GPL-2.0+ Group: Productivity/File utilities -Source: Thunar-%{version}.tar.bz2 +Url: http://thunar.xfce.org/ +Source: http://archive.xfce.org/src/xfce/thunar/1.2/Thunar-%{version}.tar.bz2 # images missing from the source tarball, see bxo#7838 -Source1: thunarx-refrence-images.tar.bz2 -Source2: thunar-sendto-bluetooth.desktop +Source1: thunarx-reference-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 @@ -36,23 +36,27 @@ BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: libpng-devel BuildRequires: perl-XML-Parser +BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools +BuildRequires: xfconf +BuildRequires: xorg-x11-devel BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(exo-1) -BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libxfce4panel-1.0) BuildRequires: pkgconfig(libxfce4ui-1) -BuildRequires: pkgconfig(libxfcegui4-1.0) -BuildRequires: update-desktop-files -BuildRequires: xfconf -BuildRequires: xfce4-dev-tools +BuildRequires: pkgconfig(libxfce4util-1.0) Recommends: %{name}-lang = %{version} Recommends: %{name}-doc = %{version} Recommends: thunar-volman @@ -69,23 +73,15 @@ useless options by default. Thunar is fast and responsive with good startup and folder load times. -%package -n libthunarx-2-0 -License: GPL-2.0+ +%package -n %{libname} 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 -from the ground up to be fast and easy to use. It provides a clean, intuitive, -and fully accessible user interface and does not include any confusing or -useless options by default. Thunar is fast and responsive with good startup and -folder load times. - +%description -n %{libname} This package contains the Thunar extension library. %package doc -License: GPL-2.0+ Summary: Documentation for Thunar Group: Documentation/HTML BuildArch: noarch @@ -93,64 +89,24 @@ Obsoletes: thunar-doc = 1.3.0 %description doc -Thunar a file manager for the Xfce desktop environment which has been designed -from the ground up to be fast and easy to use. It provides a clean, intuitive, -and fully accessible user interface and does not include any confusing or -useless options by default. Thunar is fast and responsive with good startup and -folder load times. - This package provides the user documentation for Thunar. - %package devel -License: GPL-2.0+ Summary: Development Files for Thunar Group: Development/Libraries/C and C++ -Requires: libpng-devel -Requires: libthunarx-2-0 = %{version} -Requires: pkgconfig(dbus-glib-1) -Requires: pkgconfig(exo-1) -Requires: pkgconfig(gconf-2.0) -Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(gtk+-2.0) -Requires: pkgconfig(libexif) -Requires: pkgconfig(libstartup-notification-1.0) -Requires: pkgconfig(libxfce4panel-1.0) -Requires: pkgconfig(libxfcegui4-1.0) +Requires: %{libname} = %{version} Requires: %{name} = %{version} -Recommends: %{name}-devel-doc = %{version} +Requires: pkgconfig(gtk+-2.0) +Provides: %{name}-devel-doc = %{version} +Obsoletes: %{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 -from the ground up to be fast and easy to use. It provides a clean, intuitive, -and fully accessible user interface and does not include any confusing or -useless options by default. Thunar is fast and responsive with good startup and -folder load times. - This package provides the development files needed for developing extensions for Thunar. -%package devel-doc -License: GPL-2.0+ -Summary: Developer Documentation for Thunar -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 -from the ground up to be fast and easy to use. It provides a clean, intuitive, -and fully accessible user interface and does not include any confusing or -useless options by default. Thunar is fast and responsive with good startup and -folder load times. - -This package provides the developer documentation for Thunar. - - - %lang_package + %prep %setup -q -n Thunar-%{version} -a 1 %patch0 -p1 @@ -171,30 +127,33 @@ %install %make_install -install -D -p -m 644 %{SOURCE2} \ - %{buildroot}%{_datadir}/Thunar/sendto/thunar-sendto-bluetooth.desktop + +rm -f %{buildroot}%{_libdir}/*.la \ + %{buildroot}%{_libdir}/thunarx-2/*.la \ + %{buildroot}%{_libdir}/xfce4/panel/plugins/*.la + +# these files are placed under %%{_defaultdocdir}/%%{name} instead rm -f %{buildroot}%{_datadir}/xfce4/Thunar/README.* + +# add a lowercase manpage symlink +( cd %{buildroot}%{_mandir}/man1/ && ln -sf Thunar.1* \ + $(printf "%s\n" Thunar.1* | tr [:upper:] [:lower:]) ) + %suse_update_desktop_file -i Thunar System Utility Core GTK FileManager %suse_update_desktop_file -i Thunar-bulk-rename System Utility Core GTK Filesystem %suse_update_desktop_file thunar-settings %suse_update_desktop_file -i Thunar-folder-handler System Utility Core GTK FileManager -%suse_update_desktop_file %{buildroot}%{_datadir}/Thunar/sendto/thunar-sendto-bluetooth.desktop -%find_lang Thunar -rm -f %{buildroot}%{_libdir}/*.la -rm -f %{buildroot}%{_libdir}/thunarx-2/*.la -rm -f %{buildroot}%{_libdir}/xfce4/panel/plugins/*.la -( cd %{buildroot}%{_mandir}/man1/ && ln -sf Thunar.1* \ - $(printf "%s\n" Thunar.1* | tr [:upper:] [:lower:]) ) + +%find_lang Thunar %{?no_lang_C} + %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} -%post -n libthunarx-2-0 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n libthunarx-2-0 -p /sbin/ldconfig - -%if 0%{?suse_version} >= 1140 +%postun -n %{libname} -p /sbin/ldconfig %post %desktop_database_post @@ -203,7 +162,6 @@ %postun %desktop_database_postun %icon_theme_cache_postun -%endif %files %defattr(-,root,root) @@ -232,7 +190,7 @@ %doc %{_mandir}/man1/Thunar.1* %doc %{_mandir}/man1/thunar.1* -%files -n libthunarx-2-0 +%files -n %{libname} %defattr(-,root,root) %{_libdir}/libthunarx-2.so.* @@ -244,16 +202,13 @@ %files devel %defattr(-,root,root) +%doc %{_datadir}/gtk-doc/html/thunarx %dir %{_includedir}/thunarx-2 %dir %{_includedir}/thunarx-2/thunarx %{_includedir}/thunarx-2/thunarx/*.h %{_libdir}/libthunarx-2.so %{_libdir}/pkgconfig/thunarx-2.pc -%files devel-doc -%defattr(-,root,root) -%doc %{_datadir}/gtk-doc/html/thunarx - %files lang -f Thunar.lang %changelog ++++++ thunarx-refrence-images.tar.bz2 -> thunarx-reference-images.tar.bz2 ++++++ ++++ no output (probably identical) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
