- merged from DEVEL

Changed files:
    Thunar-volman-desktop.patch -> 1.2
    Thunar-volman.spec -> 1.12

diff --git a/Thunar-volman-desktop.patch b/Thunar-volman-desktop.patch
index 38f23303110bb812bf1387823d5321b47a88f9e5..ff3d9d63572e99f6942ad30967b234bced22709a 100644 (file)
--- a/Thunar-volman-desktop.patch
+++ b/Thunar-volman-desktop.patch
@@ -1,9 +1,9 @@
---- thunar-volman-0.3.80/thunar-volman-settings.desktop.in.in~ 2008-08-21 13:23:31.000000000 +0200
-+++ thunar-volman-0.3.80/thunar-volman-settings.desktop.in.in  2010-05-11 13:05:20.741823556 +0200
+--- thunar-volman-0.5.2/thunar-volman-settings/thunar-volman-settings.desktop.in.in~   2008-08-21 13:23:31.000000000 +0200
++++ thunar-volman-0.5.2/thunar-volman-settings/thunar-volman-settings.desktop.in.in    2010-05-11 13:05:20.741823556 +0200

 @@ -9,5 +9,6 @@
  StartupNotify=true
  Type=Application
 @@ -9,5 +9,6 @@
  StartupNotify=true
  Type=Application

- Categories=X-XFCE;Settings;DesktopSettings;
+ Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;

 +OnlyShowIn=XFCE;
  
  # vi:set encoding=UTF-8:
 +OnlyShowIn=XFCE;
  
  # vi:set encoding=UTF-8:

diff --git a/Thunar-volman.spec b/Thunar-volman.spec
index 750d046b9806bf4b631162d2f142725f8f026c8f..d9173dd2d9318f99c111ed8d45f6cf3ba7bb8833 100644 (file)
--- a/Thunar-volman.spec
+++ b/Thunar-volman.spec
@@ -2,30 +2,31 @@
 Summary:       Volumes manager for Thunar
 Summary(pl.UTF-8):     Zarządca napędów dla Thunara
 Name:          Thunar-volman
 Summary:       Volumes manager for Thunar
 Summary(pl.UTF-8):     Zarządca napędów dla Thunara
 Name:          Thunar-volman

-Version:       0.3.80
-Release:       3
+Version:       0.6.0
+Release:       1

 License:       GPL v2+
 Group:         X11/Applications
 License:       GPL v2+
 Group:         X11/Applications

-Source0:       http://goodies.xfce.org/releases/thunar-volman/%{_realname}-%{version}.tar.bz2
-# Source0-md5: 4fd81b62690797317ca649ab20609dae
+Source0:       http://archive.xfce.org/src/apps/thunar-volman/0.6/%{_realname}-%{version}.tar.bz2
+# Source0-md5: 2f166662dd100d5195da238af417f305

 Patch0:                %{name}-desktop.patch
 URL:           http://goodies.xfce.org/projects/thunar-plugins/thunar-volman
 Patch0:                %{name}-desktop.patch
 URL:           http://goodies.xfce.org/projects/thunar-plugins/thunar-volman

-BuildRequires: Thunar-devel >= 1.0.0
-BuildRequires: autoconf >= 2.50
-BuildRequires: automake >= 1:1.8
+BuildRequires: Thunar-devel >= 1.2.0

 BuildRequires: dbus-glib-devel >= 0.34
 BuildRequires: dbus-glib-devel >= 0.34

-BuildRequires: exo-devel >= 0.3.100
+BuildRequires: exo-devel >= 0.6.0

 BuildRequires: gettext-devel
 BuildRequires: gettext-devel

-BuildRequires: gtk+2-devel >= 2:2.10.6
-BuildRequires: hal-devel >= 0.5.0
-BuildRequires: intltool
-BuildRequires: libtool
+BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: gtk+2-devel >= 2:2.22.0
+BuildRequires: libnotify-devel >= 0.4.0
+BuildRequires: libxfce4ui-devel >= 4.7.0
+BuildRequires: libxfce4util-devel >= 4.7.0

 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.311

-BuildRequires: xfce4-dev-tools >= 4.6.0
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
-Requires:      Thunar >= 1.0.0
+BuildRequires: udev-glib-devel >= 145
+BuildRequires: xfce4-dev-tools >= 4.8.0
+BuildRequires: xfconf-devel >= 4.8.0
+Requires:      gtk-update-icon-cache
+Requires:      hicolor-icon-theme
+Requires:      Thunar >= 1.2.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -49,12 +50,6 @@ zdjęć użytkownika.
 %patch0 -p1
 
 %build
 %patch0 -p1
 
 %build

-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}

 %configure
 %{__make}
 
 %configure
 %{__make}
 


@@ -64,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 

-mv $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ur_PK

 
 %find_lang %{_realname}
 
 
 %find_lang %{_realname}
 


@@ -81,6 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/thunar-volman
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README THANKS
 %attr(755,root,root) %{_bindir}/thunar-volman

-%attr(755,root,root) %{_libdir}/thunar-volman-settings
+%attr(755,root,root) %{_bindir}/thunar-volman-settings

 %{_desktopdir}/thunar-volman-settings.desktop
 %{_iconsdir}/hicolor/*/apps/*
 %{_desktopdir}/thunar-volman-settings.desktop
 %{_iconsdir}/hicolor/*/apps/*