Hello community, here is the log from the commit of package xfce4-panel-plugin-clipman for openSUSE:Factory checked in at 2011-10-25 17:20:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-clipman (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-clipman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-panel-plugin-clipman", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-clipman/xfce4-panel-plugin-clipman.changes 2011-10-19 00:55:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-clipman.new/xfce4-panel-plugin-clipman.changes 2011-10-28 15:29:18.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Oct 21 11:10:28 UTC 2011 - [email protected] + +- added xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch in order + to use docdir correctly +- install HTML documentation under + /usr/share/xfce4/xfce4-clipman-plugin/html +- package AUTHORS ChangeLog COPYING NEWS README TODO + +------------------------------------------------------------------- New: ---- xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-clipman.spec ++++++ --- /var/tmp/diff_new_pack.YTIxE1/_old 2011-10-28 15:29:25.000000000 +0200 +++ /var/tmp/diff_new_pack.YTIxE1/_new 2011-10-28 15:29:25.000000000 +0200 @@ -34,6 +34,8 @@ Patch2: xfce4-panel-plugin-clipman-1.1.3-catch-null-value.patch # PATCH-FIX-UPSTREAM xfce4-panel-plugin-clipman-1.1.3-fix-memory-leak.patch [email protected] -- Fix a memory leak (backported from upstream git) Patch3: xfce4-panel-plugin-clipman-1.1.3-fix-memory-leak.patch +# PATCH-FIX-UPSTREAM xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch [email protected] -- Use docdir correctly +Patch4: xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch Group: System/GUI/XFCE BuildRequires: intltool BuildRequires: fdupes @@ -78,10 +80,13 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build xdt-autogen -%configure --disable-static +%configure \ + --docdir=%{_datadir}/xfce4/xfce4-clipman-plugin \ + --disable-static make %{_smp_mflags} V=1 %install @@ -108,6 +113,7 @@ %files -f %{name}.lang %defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING NEWS README TODO %{_datadir}/xfce4/panel-plugins/xfce4-clipman-plugin.desktop %{_sysconfdir}/xdg/autostart/xfce4-clipman-plugin-autostart.desktop %config %{_sysconfdir}/xdg/xfce4/panel/xfce4-clipman-actions.xml @@ -125,10 +131,8 @@ %files doc %defattr(-,root,root) -%doc %dir %{_datadir}/xfce4/doc -%doc %dir %{_datadir}/xfce4/doc/* -%doc %dir %{_datadir}/xfce4/doc/*/images -%doc %{_datadir}/xfce4/doc/*/*clipman*.html -%doc %{_datadir}/xfce4/doc/*/images/*clipman* +%dir %{_datadir}/xfce4 +%dir %{_datadir}/xfce4/xfce4-clipman-plugin +%doc %{_datadir}/xfce4/xfce4-clipman-plugin/html/ %changelog ++++++ xfce4-panel-plugin-clipman-1.1.3-use-docdir.patch ++++++ Index: xfce4-clipman-plugin-1.1.3/docs/manual/C/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/C/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/C/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ images \ $(NULL) -TARGET_DIR = $(datadir)/xfce4/doc/C +TARGET_DIR = $(docdir)/html/C STYLESHEET = ../xfce-nochunk.xsl DOCUMENT = $(PACKAGE).xml Index: xfce4-clipman-plugin-1.1.3/docs/manual/C/images/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/C/images/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/C/images/Makefile.am @@ -1,6 +1,6 @@ NULL = -imagesdir = $(datadir)/xfce4/doc/C/images +imagesdir = $(docdir)/html/C/images images_DATA = \ clipman-action-dialog.png \ clipman-menu.png \ Index: xfce4-clipman-plugin-1.1.3/docs/manual/da/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/da/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/da/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ images \ $(NULL) -TARGET_DIR = $(datadir)/xfce4/doc/da +TARGET_DIR = $(docdir)/html/da STYLESHEET = ../xfce-nochunk.xsl DOCUMENT = $(PACKAGE).xml Index: xfce4-clipman-plugin-1.1.3/docs/manual/da/images/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/da/images/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/da/images/Makefile.am @@ -1,6 +1,6 @@ NULL = -imagesdir = $(datadir)/xfce4/doc/da/images +imagesdir = $(docdir)/html/da/images images_DATA = \ clipman-action-dialog.png \ clipman-menu.png \ Index: xfce4-clipman-plugin-1.1.3/docs/manual/fr/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/fr/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/fr/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ images \ $(NULL) -TARGET_DIR = $(datadir)/xfce4/doc/fr +TARGET_DIR = $(docdir)/html/fr STYLESHEET = ../xfce-nochunk.xsl DOCUMENT = $(PACKAGE).xml Index: xfce4-clipman-plugin-1.1.3/docs/manual/fr/images/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/fr/images/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/fr/images/Makefile.am @@ -1,6 +1,6 @@ NULL = -imagesdir = $(datadir)/xfce4/doc/fr/images +imagesdir = $(docdir)/html/fr/images images_DATA = \ clipman-action-dialog.png \ clipman-menu.png \ Index: xfce4-clipman-plugin-1.1.3/docs/manual/gl/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/gl/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/gl/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ images \ $(NULL) -TARGET_DIR = $(datadir)/xfce4/doc/gl +TARGET_DIR = $(docdir)/html/gl STYLESHEET = ../xfce-nochunk.xsl DOCUMENT = $(PACKAGE).xml Index: xfce4-clipman-plugin-1.1.3/docs/manual/gl/images/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/gl/images/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/gl/images/Makefile.am @@ -1,6 +1,6 @@ NULL = -imagesdir = $(datadir)/xfce4/doc/gl/images +imagesdir = $(docdir)/html/gl/images images_DATA = \ clipman-action-dialog.png \ clipman-menu.png \ Index: xfce4-clipman-plugin-1.1.3/docs/manual/it/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/it/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/it/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ images \ $(NULL) -TARGET_DIR = $(datadir)/xfce4/doc/it +TARGET_DIR = $(docdir)/html/it STYLESHEET = ../xfce-nochunk.xsl DOCUMENT = $(PACKAGE).xml Index: xfce4-clipman-plugin-1.1.3/docs/manual/it/images/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/it/images/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/it/images/Makefile.am @@ -1,6 +1,6 @@ NULL = -imagesdir = $(datadir)/xfce4/doc/it/images +imagesdir = $(docdir)/html/it/images images_DATA = \ clipman-action-dialog.png \ clipman-menu.png \ Index: xfce4-clipman-plugin-1.1.3/docs/manual/ja/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/ja/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/ja/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ images \ $(NULL) -TARGET_DIR = $(datadir)/xfce4/doc/ja +TARGET_DIR = $(docdir)/html/ja STYLESHEET = ../xfce-nochunk.xsl DOCUMENT = $(PACKAGE).xml Index: xfce4-clipman-plugin-1.1.3/docs/manual/ja/images/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/ja/images/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/ja/images/Makefile.am @@ -1,6 +1,6 @@ NULL = -imagesdir = $(datadir)/xfce4/doc/ja/images +imagesdir = $(docdir)/html/ja/images images_DATA = \ clipman-action-dialog.png \ clipman-menu.png \ Index: xfce4-clipman-plugin-1.1.3/docs/manual/zh_CN/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/zh_CN/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/zh_CN/Makefile.am @@ -10,7 +10,7 @@ SUBDIRS = \ images \ $(NULL) -TARGET_DIR = $(datadir)/xfce4/doc/zh_CN +TARGET_DIR = $(docdir)/html/zh_CN STYLESHEET = ../xfce-nochunk.xsl DOCUMENT = $(PACKAGE).xml Index: xfce4-clipman-plugin-1.1.3/docs/manual/zh_CN/images/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/docs/manual/zh_CN/images/Makefile.am +++ xfce4-clipman-plugin-1.1.3/docs/manual/zh_CN/images/Makefile.am @@ -1,6 +1,6 @@ NULL = -imagesdir = $(datadir)/xfce4/doc/zh_CN/images +imagesdir = $(docdir)/html/zh_CN/images images_DATA = \ clipman-action-dialog.png \ clipman-menu.png \ Index: xfce4-clipman-plugin-1.1.3/panel-plugin/Makefile.am =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/panel-plugin/Makefile.am +++ xfce4-clipman-plugin-1.1.3/panel-plugin/Makefile.am @@ -7,6 +7,7 @@ INCLUDES = \ -DDATADIR=\"$(datadir)\" \ -DSRCDIR=\"$(top_srcdir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DDOCROOTDIR=\"$(docdir)\" \ $(NULL) bin_PROGRAMS = xfce4-clipman xfce4-popup-clipman xfce4-clipman-settings Index: xfce4-clipman-plugin-1.1.3/panel-plugin/xfce4-clipman-settings.c =================================================================== --- xfce4-clipman-plugin-1.1.3.orig/panel-plugin/xfce4-clipman-settings.c +++ xfce4-clipman-plugin-1.1.3/panel-plugin/xfce4-clipman-settings.c @@ -166,31 +166,31 @@ cb_show_help (GtkButton *button) locale = g_strdup ("C"); #endif - filename = g_strdup_printf (DATAROOTDIR"/xfce4/doc/%s/"PACKAGE".html", locale); + filename = g_strdup_printf (DOCROOTDIR"/html/%s/"PACKAGE".html", locale); if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { offset = g_strrstr (locale, "_"); if (offset == NULL) { g_free (filename); - filename = g_strdup (DATAROOTDIR"/xfce4/doc/C/"PACKAGE".html"); + filename = g_strdup (DOCROOTDIR"/html/C/"PACKAGE".html"); } else { *offset = '\0'; g_free (filename); - filename = g_strdup_printf (DATAROOTDIR"/xfce4/doc/%s/"PACKAGE".html", locale); + filename = g_strdup_printf (DOCROOTDIR"/html/%s/"PACKAGE".html", locale); if (!g_file_test (filename, G_FILE_TEST_EXISTS)) { g_free (filename); - filename = g_strdup (DATAROOTDIR"/xfce4/doc/C/"PACKAGE".html"); + filename = g_strdup (DOCROOTDIR"/html/C/"PACKAGE".html"); } } } g_free (locale); #else - filename = g_strdup (DATAROOTDIR"/xfce4/doc/C/"PACKAGE".html"); + filename = g_strdup (DOCROOTDIR"/html/C/"PACKAGE".html"); #endif screen = gtk_widget_get_screen (GTK_WIDGET (button)); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
