[xfce4-smartbookmark-plugin] Update to 0.4.4 Drop upstream patches

Tue Nov 1 21:33:00 UTC 2011

commit f149f60cbfcaa40e3730b249645d3c98c071f1e2
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Tue Nov 1 22:32:53 2011 +0100

    Update to 0.4.4
    Drop upstream patches

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 ...4-smartbookmark-plugin-0.4.2-desktop-file.patch |   12 -
 xfce4-smartbookmark-plugin-0.4.2-fix-linking.patch |   36 -
 ...bookmark-plugin-0.4.2-update-translations.patch | 2150 --------------------
 xfce4-smartbookmark-plugin-0.4.4-plugin-dir.patch  |   49 +
 xfce4-smartbookmark-plugin.spec                    |   50 +-
 7 files changed, 73 insertions(+), 2227 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 348dc95..2bea722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xfce4-smartbookmark-plugin-0.4.2.tar.gz
+/xfce4-smartbookmark-plugin-0.4.4.tar.bz2
diff --git a/sources b/sources
index 1970f46..ab10fac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-284e26595637dd2e900b75534372496b  xfce4-smartbookmark-plugin-0.4.2.tar.gz
+273e38306a82f14e1b8c2c5db912f6c3  xfce4-smartbookmark-plugin-0.4.4.tar.bz2
diff --git a/xfce4-smartbookmark-plugin-0.4.4-plugin-dir.patch b/xfce4-smartbookmark-plugin-0.4.4-plugin-dir.patch
new file mode 100644
index 0000000..e8d5ec6
--- /dev/null
+++ b/xfce4-smartbookmark-plugin-0.4.4-plugin-dir.patch
@@ -0,0 +1,49 @@
+diff -dur xfce4-smartbookmark-plugin-0.4.4.orig/src/Makefile.am xfce4-smartbookmark-plugin-0.4.4/src/Makefile.am
+--- xfce4-smartbookmark-plugin-0.4.4.orig/src/Makefile.am	2011-11-01 14:04:39.000000000 +0100
++++ xfce4-smartbookmark-plugin-0.4.4/src/Makefile.am	2011-11-01 22:09:09.015954505 +0100
+@@ -26,7 +26,7 @@
+ desktop_in_in_files = smartbookmark.desktop.in.in
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+ 
+-desktopdir = $(datadir)/xfce4/panel-plugins
++desktopdir = $(datadir)/xfce4/panel/plugins
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+ 
+@@ -38,5 +38,5 @@
+ 
+ # get full path into .desktop file
+ %.desktop.in: %.desktop.in.in
+-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
++	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel/plugins^" \
+ 		$< > $@
+diff -dur xfce4-smartbookmark-plugin-0.4.4.orig/src/Makefile.in xfce4-smartbookmark-plugin-0.4.4/src/Makefile.in
+--- xfce4-smartbookmark-plugin-0.4.4.orig/src/Makefile.in	2011-11-01 14:49:58.000000000 +0100
++++ xfce4-smartbookmark-plugin-0.4.4/src/Makefile.in	2011-11-01 22:09:31.319813943 +0100
+@@ -253,7 +253,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-plugindir = $(libdir)/xfce4/panel-plugins
++plugindir = $(libdir)/xfce4/panel/plugins
+ plugin_LTLIBRARIES = \
+ 	libsmartbookmark.la
+ 
+@@ -278,7 +278,7 @@
+ 
+ desktop_in_in_files = smartbookmark.desktop.in.in
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+-desktopdir = $(datadir)/xfce4/panel-plugins
++desktopdir = $(datadir)/xfce4/panel/plugins
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ EXTRA_DIST = \
+ 	$(desktop_in_in_files)
+@@ -623,7 +623,7 @@
+ 
+ # get full path into .desktop file
+ %.desktop.in: %.desktop.in.in
+-	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel-plugins^" \
++	sed -e "s^@INTERNAL_PLUGIN_PATH@^$(libdir)/xfce4/panel/plugins^" \
+ 		$< > $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/xfce4-smartbookmark-plugin.spec b/xfce4-smartbookmark-plugin.spec
index 27f08f8..4af5f24 100644
--- a/xfce4-smartbookmark-plugin.spec
+++ b/xfce4-smartbookmark-plugin.spec
@@ -3,33 +3,26 @@
 %global minor_version 0.4
 
 Name:           xfce4-smartbookmark-plugin
-Version:        0.4.2
-Release:        13%{?dist}
+Version:        0.4.4
+Release:        1%{?dist}
 Summary:        Smart bookmarks for the Xfce panel
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://goodies.xfce.org/projects/panel-plugins/%{name}
-Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.gz
-# https://bugzilla.redhat.com/show_bug.cgi?id=509294
-# not yet in Xfce bugzilla, because the smartbookmark component is missing
-Patch0:         %{name}-0.4.2-desktop-file.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=564846
-# reported upstream at http://bugzilla.xfce.org/show_bug.cgi?id=6939
-Patch1:         %{name}-0.4.2-fix-linking.patch
-# contains all translations from
-# http://translations.xfce.org/projects/p/xfce4-dateime-plugin/c/master/
-# as of 2011-06-12
-Patch2:         %{name}-0.4.2-update-translations.patch
+Source0:        http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2
+# we want all plugins to use the new plugin locations
+Patch0:         xfce4-smartbookmark-plugin-0.4.4-plugin-dir.patch
 # vendor specific patches
 Patch10:        %{name}-0.4.2-redhat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xfce4-panel-devel >= 4.3.99.1, libxfcegui4-devel >= 4.3.90.2
-BuildRequires:  libxml2-devel, gettext, perl(XML::Parser)
-BuildRequires:  libXt-devel
-BuildRequires:  autoconf
-Requires:       xfce4-panel >= 4.4.0, webclient
+BuildRequires:  xfce4-panel-devel >= 4.3.20
+BuildRequires:  libxfcegui4-devel >= 4.2
+BuildRequires:  gettext
+BuildRequires:  intltool
+Requires:       xfce4-panel >= 4.4.0
+Requires:       webclient
 
 %description
 A plugin which allows you to do a search directly on Internet on sites like 
@@ -38,37 +31,38 @@ browser and perform custom searches.
 
 %prep
 %setup -q
-%patch0 -b .path
-%patch1 -p1 -b .linking
-%patch2 -p1 -b .update-translations
+%patch0 -p1 -b .plugin-dir
 %patch10 -b .redhat
 
 
 %build
-autoconf
 %configure --disable-static
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
-%{_libdir}/xfce4/panel-plugins/*.so
-%{_datadir}/xfce4/panel-plugins/*.desktop
+%{_libdir}/xfce4/panel/plugins/*.so
+%{_datadir}/xfce4/panel/plugins/*.desktop
 
 
 %changelog
+* Tue Nov 01 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.4-1
+- Update to 0.4.4
+- Drop upstream patches
+
 * Sun Jun 12 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.4.2-13
 - Fix location of the desktop file (#711418)
 - Update translations form Xfce transifex
