Hello community,
here is the log from the commit of package xfce4-screenshooter for
openSUSE:Factory checked in at 2012-05-09 18:22:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-screenshooter (Old)
and /work/SRC/openSUSE:Factory/.xfce4-screenshooter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-screenshooter", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/xfce4-screenshooter/xfce4-screenshooter.changes
2012-04-19 10:42:21.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xfce4-screenshooter.new/xfce4-screenshooter.changes
2012-05-09 19:32:58.000000000 +0200
@@ -1,0 +2,26 @@
+Mon May 7 12:47:08 UTC 2012 - [email protected]
+
+- fix xfce4-screenshooter-fix-plugin-linking.patch so the panel
+ plugin is linked against libscreenshooter
+- fix help function by depending on libxfce4ui-tools which provides
+ xfhelp4 again
+
+-------------------------------------------------------------------
+Thu May 3 07:27:12 UTC 2012 - [email protected]
+
+- update to version 1.8.1
+ - adapting the panel plugin to xfce4-panel 4.9+
+ - add a clipboard CLI option
+ - panel plugin is now built as a library
+ - fix crash with some window managers
+ - fix crash with NULL save path
+ - install documentation to new location
+ - add explicit -lm link to LIBADD
+ - plugin installation location compatible with xfce4-panel 4.9+
+ - update outdated man page
+- rebased xfce4-screenshooter-1.8.0-use-docdir.patch as
+ xfce4-screenshooter-use-docdir.patch
+- added xfce4-screenshooter-fix-plugin-linking.patch in order to
+ link the plugin module correctly
+
+-------------------------------------------------------------------
Old:
----
xfce4-screenshooter-1.8.0-use-docdir.patch
xfce4-screenshooter-1.8.0.tar.bz2
xfce4-screenshooter-fix-crash-with-some-wms.patch
xfce4-screenshooter-fix-libm-underlinking.patch
New:
----
xfce4-screenshooter-1.8.1.tar.bz2
xfce4-screenshooter-fix-plugin-linking.patch
xfce4-screenshooter-use-docdir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-screenshooter.spec ++++++
--- /var/tmp/diff_new_pack.zFy5A0/_old 2012-05-09 19:33:00.000000000 +0200
+++ /var/tmp/diff_new_pack.zFy5A0/_new 2012-05-09 19:33:00.000000000 +0200
@@ -20,19 +20,17 @@
%define panel_version 4.7.0
Name: xfce4-screenshooter
-Version: 1.8.0
+Version: 1.8.1
Release: 0
Summary: Screenshot Tool for the Xfce Desktop
License: GPL-2.0+
Group: Productivity/Graphics/Other
Url:
http://goodies.xfce.org/projects/applications/xfce4-screenshooter
Source:
http://archive.xfce.org/src/apps/xfce4-screenshooter/1.8/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM xfce4-screenshooter-fix-libm-underlinking.patch bxo#7985
[email protected] -- Link explicitly against libm
-Patch0: xfce4-screenshooter-fix-libm-underlinking.patch
-# PATCH-FIX-UPSTREAM xfce4-screenshooter-1.8.0-use-docdir.patch
[email protected] -- Allow installation of documentation under docdir
-Patch1: xfce4-screenshooter-1.8.0-use-docdir.patch
-# PATCH-FIX-UPSTREAM xfce4-screenshooter-fix-crash-with-some-wms.patch
bxo#8080 [email protected] -- Fixes a crash when taking a screenshot of a
window with some window managers (backported from upstream git)
-Patch2: xfce4-screenshooter-fix-crash-with-some-wms.patch
+# PATCH-FIX-UPSTREAM xfce4-screenshooter-use-docdir.patch [email protected] --
Allow installation of documentation under docdir
+Patch0: xfce4-screenshooter-use-docdir.patch
+# PATCH-FIX-UPSTREAM xfce4-screenshooter-fix-plugin-linking.patch
[email protected] -- Link the plugin module correctly
+Patch1: xfce4-screenshooter-fix-plugin-linking.patch
BuildRequires: fdupes
BuildRequires: intltool
BuildRequires: update-desktop-files
@@ -50,6 +48,8 @@
BuildRequires: pkgconfig(xfixes)
Recommends: %{name}-doc = %{version}
Recommends: %{name}-lang = %{version}
+# needs xfhelp4
+Requires: libxfce4ui-tools
Suggests: xfce4-panel-plugin-screenshooter
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -82,7 +82,6 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%build
xdt-autogen
@@ -92,6 +91,8 @@
%install
%make_install
+rm -f %{buildroot}%{_libdir}/xfce4/panel/plugins/libscreenshooterplugin.la
+
%find_lang xfce4-screenshooter %{?no_lang_C}
%suse_update_desktop_file -r xfce4-screenshooter -G 'Screenshot Tool' Utility
X-SuSE-DesktopUtility GTK
@@ -119,8 +120,8 @@
%files -n xfce4-panel-plugin-screenshooter
%defattr(-,root,root,-)
-%{_libexecdir}/xfce4/panel-plugins/xfce4-screenshooter-plugin
-%{_datadir}/xfce4/panel-plugins/screenshooter.desktop
+%{_libdir}/xfce4/panel/plugins/libscreenshooterplugin.so
+%{_datadir}/xfce4/panel/plugins/screenshooter.desktop
%files doc
%defattr(-,root,root,-)
++++++ xfce4-screenshooter-1.8.0.tar.bz2 -> xfce4-screenshooter-1.8.1.tar.bz2
++++++
++++ 29667 lines of diff (skipped)
++++++ xfce4-screenshooter-fix-plugin-linking.patch ++++++
Index: xfce4-screenshooter-1.8.1/Makefile.am
===================================================================
--- xfce4-screenshooter-1.8.1.orig/Makefile.am
+++ xfce4-screenshooter-1.8.1/Makefile.am
@@ -132,13 +132,19 @@ panel_plugin_libscreenshooterplugin_la_C
@SOUP_CFLAGS@
panel_plugin_libscreenshooterplugin_la_LDFLAGS = \
+ -avoid-version \
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
+
+panel_plugin_libscreenshooterplugin_la_LIBADD = \
@EXO_LIBS@ \
@LIBXFCE4PANEL_LIBS@ \
@GTHREAD_LIBS@ \
@SOUP_LIBS@ \
- @LIBXFCE4UI_LIBS@
-
-panel_plugin_libscreenshooterplugin_la_LIBADD = lib/libscreenshooter.la
+ @LIBXFCE4UI_LIBS@ \
+ lib/libscreenshooter.la
panel_plugin_libscreenshooterplugin_la_SOURCES = \
panel-plugin/screenshooter-plugin.c
++++++ xfce4-screenshooter-use-docdir.patch ++++++
Index: xfce4-screenshooter-1.8.1/Makefile.am
===================================================================
--- xfce4-screenshooter-1.8.1.orig/Makefile.am
+++ xfce4-screenshooter-1.8.1/Makefile.am
@@ -190,7 +190,7 @@ noinst_DATA = \
docs/manual/zh_CN/index.xml
# Asturian documentation
-astdocdir = $(datadir)/xfce4/doc/ast
+astdocdir = $(docdir)/html/ast/
astdoc_DATA = docs/manual/ast/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -199,7 +199,7 @@ docs/manual/ast/index.html: docs/manual/
endif
endif
-astimagesdir = $(datadir)/xfce4/doc/ast/images
+astimagesdir = $(docdir)/html/ast/images
astimages_DATA = \
docs/manual/ast/images/xfce4-screenshooter-dialog1.png \
docs/manual/ast/images/xfce4-screenshooter-dialog2.png \
@@ -208,7 +208,7 @@ astimages_DATA = \
# C documentation
-cdocdir = $(datadir)/doc/xfce4-screenshooter/html/C/
+cdocdir = $(docdir)/html/C/
cdoc_DATA = docs/manual/C/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -217,7 +217,7 @@ docs/manual/C/index.html: docs/manual/C/
endif
endif
-cimagesdir = $(datadir)/doc/xfce4-screenshooter/html/C/images
+cimagesdir = $(docdir)/html/C/images
cimages_DATA = \
docs/manual/C/images/xfce4-screenshooter-dialog1.png \
docs/manual/C/images/xfce4-screenshooter-dialog2.png \
@@ -226,7 +226,7 @@ cimages_DATA = \
# Catalan documentation
-cadocdir = $(datadir)/doc/xfce4-screenshooter/html/ca
+cadocdir = $(docdir)/html/ca
cadoc_DATA = docs/manual/ca/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -235,7 +235,7 @@ docs/manual/ca/index.html: docs/manual/c
endif
endif
-caimagesdir = $(datadir)/doc/xfce4-screenshooter/html/ca/images
+caimagesdir = $(docdir)/html/ca/images
caimages_DATA = \
docs/manual/ca/images/xfce4-screenshooter-dialog1.png \
docs/manual/ca/images/xfce4-screenshooter-dialog2.png \
@@ -244,7 +244,7 @@ caimages_DATA = \
# Danish documentation
-dadocdir = $(datadir)/doc/xfce4-screenshooter/html/da
+dadocdir = $(docdir)/html/da
dadoc_DATA = docs/manual/da/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -253,7 +253,7 @@ docs/manual/da/index.html: docs/manual/d
endif
endif
-daimagesdir = $(datadir)/doc/xfce4-screenshooter/html/da/images
+daimagesdir = $(docdir)/html/da/images
daimages_DATA = \
docs/manual/da/images/xfce4-screenshooter-dialog1.png \
docs/manual/da/images/xfce4-screenshooter-dialog2.png \
@@ -261,7 +261,7 @@ daimages_DATA = \
docs/manual/da/images/xfce4-screenshooter-zimagez-result-dialog.png
# Portuguese documentation
-ptdocdir = $(datadir)/doc/xfce4-screenshooter/html/pt
+ptdocdir = $(docdir)/html/pt
ptdoc_DATA = docs/manual/pt/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -270,7 +270,7 @@ docs/manual/pt/index.html: docs/manual/p
endif
endif
-ptimagesdir = $(datadir)/doc/xfce4-screenshooter/html/pt/images
+ptimagesdir = $(docdir)/html/pt/images
ptimages_DATA = \
docs/manual/pt/images/xfce4-screenshooter-dialog1.png \
docs/manual/pt/images/xfce4-screenshooter-dialog2.png \
@@ -278,7 +278,7 @@ ptimages_DATA = \
docs/manual/pt/images/xfce4-screenshooter-zimagez-result-dialog.png
# Spanish documentation
-esdocdir = $(datadir)/doc/xfce4-screenshooter/html/es
+esdocdir = $(docdir)/html/es
esdoc_DATA = docs/manual/es/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -287,7 +287,7 @@ docs/manual/es/index.html: docs/manual/e
endif
endif
-esimagesdir = $(datadir)/doc/xfce4-screenshooter/html/es/images
+esimagesdir = $(docdir)/html/es/images
esimages_DATA = \
docs/manual/es/images/xfce4-screenshooter-dialog1.png \
docs/manual/es/images/xfce4-screenshooter-dialog2.png \
@@ -295,7 +295,7 @@ esimages_DATA = \
docs/manual/es/images/xfce4-screenshooter-zimagez-result-dialog.png
# French documentation
-frdocdir = $(datadir)/doc/xfce4-screenshooter/html/fr
+frdocdir = $(docdir)/html/fr
frdoc_DATA = docs/manual/fr/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -304,7 +304,7 @@ docs/manual/fr/index.html: docs/manual/f
endif
endif
-frimagesdir = $(datadir)/doc/xfce4-screenshooter/html/fr/images
+frimagesdir = $(docdir)/html/fr/images
frimages_DATA = \
docs/manual/fr/images/xfce4-screenshooter-dialog1.png \
docs/manual/fr/images/xfce4-screenshooter-dialog2.png \
@@ -312,7 +312,7 @@ frimages_DATA = \
docs/manual/fr/images/xfce4-screenshooter-zimagez-result-dialog.png
# Galician documentation
-gldocdir = $(datadir)/doc/xfce4-screenshooter/html/gl
+gldocdir = $(docdir)/html/gl
gldoc_DATA = docs/manual/gl/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -321,7 +321,7 @@ docs/manual/gl/index.html: docs/manual/g
endif
endif
-glimagesdir = $(datadir)/doc/xfce4-screenshooter/html/gl/images
+glimagesdir = $(docdir)/html/gl/images
glimages_DATA = \
docs/manual/gl/images/xfce4-screenshooter-dialog1.png \
docs/manual/gl/images/xfce4-screenshooter-dialog2.png \
@@ -329,7 +329,7 @@ glimages_DATA = \
docs/manual/gl/images/xfce4-screenshooter-zimagez-result-dialog.png
# Indonesian documentation
-iddocdir = $(datadir)/doc/xfce4-screenshooter/html/id
+iddocdir = $(docdir)/html/id
iddoc_DATA = docs/manual/id/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -338,7 +338,7 @@ docs/manual/id/index.html: docs/manual/i
endif
endif
-idimagesdir = $(datadir)/doc/xfce4-screenshooter/html/id/images
+idimagesdir = $(docdir)/html/id/images
idimages_DATA = \
docs/manual/id/images/xfce4-screenshooter-dialog1.png \
docs/manual/id/images/xfce4-screenshooter-dialog2.png \
@@ -346,7 +346,7 @@ idimages_DATA = \
docs/manual/id/images/xfce4-screenshooter-zimagez-result-dialog.png
# Italian documentation
-itdocdir = $(datadir)/doc/xfce4-screenshooter/html/it
+itdocdir = $(docdir)/html/it
itdoc_DATA = docs/manual/it/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -355,7 +355,7 @@ docs/manual/it/index.html: docs/manual/i
endif
endif
-itimagesdir = $(datadir)/doc/xfce4-screenshooter/html/it/images
+itimagesdir = $(docdir)/html/it/images
itimages_DATA = \
docs/manual/it/images/xfce4-screenshooter-dialog1.png \
docs/manual/it/images/xfce4-screenshooter-dialog2.png \
@@ -363,7 +363,7 @@ itimages_DATA = \
docs/manual/it/images/xfce4-screenshooter-zimagez-result-dialog.png
# Japanese documentation
-jadocdir = $(datadir)/doc/xfce4-screenshooter/html/ja
+jadocdir = $(docdir)/html/ja
jadoc_DATA = docs/manual/ja/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -372,7 +372,7 @@ docs/manual/ja/index.html: docs/manual/j
endif
endif
-jaimagesdir = $(datadir)/doc/xfce4-screenshooter/html/ja/images
+jaimagesdir = $(docdir)/html/ja/images
jaimages_DATA = \
docs/manual/ja/images/xfce4-screenshooter-dialog1.png \
docs/manual/ja/images/xfce4-screenshooter-dialog2.png \
@@ -380,7 +380,7 @@ jaimages_DATA = \
docs/manual/ja/images/xfce4-screenshooter-zimagez-result-dialog.png
# Turkish documentation
-trdocdir = $(datadir)/doc/xfce4-screenshooter/html/tr
+trdocdir = $(docdir)/html/tr
trdoc_DATA = docs/manual/tr/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -389,7 +389,7 @@ docs/manual/tr/index.html: docs/manual/t
endif
endif
-trimagesdir = $(datadir)/doc/xfce4-screenshooter/html/tr/images
+trimagesdir = $(docdir)/html/tr/images
trimages_DATA = \
docs/manual/tr/images/xfce4-screenshooter-dialog1.png \
docs/manual/tr/images/xfce4-screenshooter-dialog2.png \
@@ -398,7 +398,7 @@ trimages_DATA = \
# Siplified Chinese documentation
-zhcndocdir = $(datadir)/doc/xfce4-screenshooter/html/zh_CN
+zhcndocdir = $(docdir)/html/zh_CN
zhcndoc_DATA = docs/manual/zh_CN/index.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -407,7 +407,7 @@ docs/manual/zh_CN/index.html: docs/manua
endif
endif
-zhcnimagesdir = $(datadir)/doc/xfce4-screenshooter/html/zh_CN/images
+zhcnimagesdir = $(docdir)/html/zh_CN/images
zhcnimages_DATA = \
docs/manual/zh_CN/images/xfce4-screenshooter-dialog1.png \
docs/manual/zh_CN/images/xfce4-screenshooter-dialog2.png \
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]