Hello community,
here is the log from the commit of package xfce4-screenshooter for
openSUSE:12.1 checked in at 2011-10-25 17:20:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/xfce4-screenshooter (Old)
and /work/SRC/openSUSE:12.1/.xfce4-screenshooter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-screenshooter", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:12.1/xfce4-screenshooter/xfce4-screenshooter.changes
2011-10-24 13:35:14.000000000 +0200
+++
/work/SRC/openSUSE:12.1/.xfce4-screenshooter.new/xfce4-screenshooter.changes
2011-10-28 19:11:51.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Oct 21 14:28:25 UTC 2011 - g...@opensuse.org
+
+- added xfce4-screenshooter-1.8.0-use-docdir.patch in order to
+ allow installation of documentation under docdir
+- install HTML documentation under
+ /usr/share/xfce4/xfce4-screenshooter/html
+
+-------------------------------------------------------------------
New:
----
xfce4-screenshooter-1.8.0-use-docdir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-screenshooter.spec ++++++
--- /var/tmp/diff_new_pack.tYljpH/_old 2011-10-28 19:11:51.000000000 +0200
+++ /var/tmp/diff_new_pack.tYljpH/_new 2011-10-28 19:11:51.000000000 +0200
@@ -29,6 +29,8 @@
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM xfce4-screenshooter-fix-libm-underlinking.patch bxo#7985
g...@opensuse.org -- Link explicitly against libm
Patch0: xfce4-screenshooter-fix-libm-underlinking.patch
+# PATCH-FIX-UPSTREAM xfce4-screenshooter-1.8.0-use-docdir.patch
g...@opensuse.org -- Allow installation of documentation under docdir
+Patch1: xfce4-screenshooter-1.8.0-use-docdir.patch
BuildRequires: pkgconfig(exo-1)
BuildRequires: pkgconfig(libxfce4ui-1)
BuildRequires: pkgconfig(libxfce4panel-1.0)
@@ -36,8 +38,6 @@
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xfixes)
BuildRequires: xfce4-dev-tools
-BuildRequires: libxslt
-BuildRequires: xml2po
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: fdupes
@@ -82,12 +82,12 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
xdt-autogen
%configure \
- --enable-xsltproc \
- --enable-xml2po
+ --docdir=%{_datadir}/xfce4/xfce4-screenshooter
make %{?_smp_mflags} V=1
%install
@@ -112,6 +112,7 @@
%files
%defattr(-,root,root,-)
+%doc COPYING NEWS README TODO
%doc %{_mandir}/man1/xfce4-screenshooter.1*
%{_bindir}/xfce4-screenshooter
%{_datadir}/icons/hicolor/48x48/apps/applets-screenshooter.png
@@ -127,8 +128,9 @@
%files doc
%defattr(-,root,root,-)
-%doc COPYING NEWS README TODO
-%doc %{_datadir}/xfce4/doc
+%dir %{_datadir}/xfce4
+%dir %{_datadir}/xfce4/xfce4-screenshooter
+%doc %{_datadir}/xfce4/xfce4-screenshooter/html/
%files lang -f %{name}.lang
++++++ xfce4-screenshooter-1.8.0-use-docdir.patch ++++++
Index: xfce4-screenshooter-1.8.0/Makefile.am
===================================================================
--- xfce4-screenshooter-1.8.0.orig/Makefile.am
+++ xfce4-screenshooter-1.8.0/Makefile.am
@@ -193,7 +193,7 @@ noinst_DATA = \
docs/manual/zh_CN/xfce4-screenshooter.xml
# Asturian documentation
-astdocdir = $(datadir)/xfce4/doc/ast
+astdocdir = $(docdir)/html/ast
astdoc_DATA = docs/manual/ast/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -202,7 +202,7 @@ docs/manual/ast/xfce4-screenshooter.html
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 \
@@ -211,7 +211,7 @@ astimages_DATA = \
# C documentation
-cdocdir = $(datadir)/xfce4/doc/C
+cdocdir = $(docdir)/html/C
cdoc_DATA = docs/manual/C/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -220,7 +220,7 @@ docs/manual/C/xfce4-screenshooter.html:
endif
endif
-cimagesdir = $(datadir)/xfce4/doc/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 \
@@ -229,7 +229,7 @@ cimages_DATA = \
# Catalan documentation
-cadocdir = $(datadir)/xfce4/doc/ca
+cadocdir = $(docdir)/html/ca
cadoc_DATA = docs/manual/ca/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -238,7 +238,7 @@ docs/manual/ca/xfce4-screenshooter.html:
endif
endif
-caimagesdir = $(datadir)/xfce4/doc/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 \
@@ -247,7 +247,7 @@ caimages_DATA = \
# Danish documentation
-dadocdir = $(datadir)/xfce4/doc/da
+dadocdir = $(docdir)/html/da
dadoc_DATA = docs/manual/da/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -256,7 +256,7 @@ docs/manual/da/xfce4-screenshooter.html:
endif
endif
-daimagesdir = $(datadir)/xfce4/doc/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 \
@@ -264,7 +264,7 @@ daimages_DATA = \
docs/manual/da/images/xfce4-screenshooter-zimagez-result-dialog.png
# Portuguese documentation
-ptdocdir = $(datadir)/xfce4/doc/pt
+ptdocdir = $(docdir)/html/pt
ptdoc_DATA = docs/manual/pt/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -273,7 +273,7 @@ docs/manual/pt/xfce4-screenshooter.html:
endif
endif
-ptimagesdir = $(datadir)/xfce4/doc/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 \
@@ -281,7 +281,7 @@ ptimages_DATA = \
docs/manual/pt/images/xfce4-screenshooter-zimagez-result-dialog.png
# Spanish documentation
-esdocdir = $(datadir)/xfce4/doc/es
+esdocdir = $(docdir)/html/es
esdoc_DATA = docs/manual/es/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -290,7 +290,7 @@ docs/manual/es/xfce4-screenshooter.html:
endif
endif
-esimagesdir = $(datadir)/xfce4/doc/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 \
@@ -298,7 +298,7 @@ esimages_DATA = \
docs/manual/es/images/xfce4-screenshooter-zimagez-result-dialog.png
# French documentation
-frdocdir = $(datadir)/xfce4/doc/fr
+frdocdir = $(docdir)/html/fr
frdoc_DATA = docs/manual/fr/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -307,7 +307,7 @@ docs/manual/fr/xfce4-screenshooter.html:
endif
endif
-frimagesdir = $(datadir)/xfce4/doc/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 \
@@ -315,7 +315,7 @@ frimages_DATA = \
docs/manual/fr/images/xfce4-screenshooter-zimagez-result-dialog.png
# Galician documentation
-gldocdir = $(datadir)/xfce4/doc/gl
+gldocdir = $(docdir)/html/gl
gldoc_DATA = docs/manual/gl/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -324,7 +324,7 @@ docs/manual/gl/xfce4-screenshooter.html:
endif
endif
-glimagesdir = $(datadir)/xfce4/doc/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 \
@@ -332,7 +332,7 @@ glimages_DATA = \
docs/manual/gl/images/xfce4-screenshooter-zimagez-result-dialog.png
# Indonesian documentation
-iddocdir = $(datadir)/xfce4/doc/id
+iddocdir = $(docdir)/html/id
iddoc_DATA = docs/manual/id/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -341,7 +341,7 @@ docs/manual/id/xfce4-screenshooter.html:
endif
endif
-idimagesdir = $(datadir)/xfce4/doc/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 \
@@ -349,7 +349,7 @@ idimages_DATA = \
docs/manual/id/images/xfce4-screenshooter-zimagez-result-dialog.png
# Italian documentation
-itdocdir = $(datadir)/xfce4/doc/it
+itdocdir = $(docdir)/html/it
itdoc_DATA = docs/manual/it/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -358,7 +358,7 @@ docs/manual/it/xfce4-screenshooter.html:
endif
endif
-itimagesdir = $(datadir)/xfce4/doc/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 \
@@ -366,7 +366,7 @@ itimages_DATA = \
docs/manual/it/images/xfce4-screenshooter-zimagez-result-dialog.png
# Japanese documentation
-jadocdir = $(datadir)/xfce4/doc/ja
+jadocdir = $(docdir)/html/ja
jadoc_DATA = docs/manual/ja/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -375,7 +375,7 @@ docs/manual/ja/xfce4-screenshooter.html:
endif
endif
-jaimagesdir = $(datadir)/xfce4/doc/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 \
@@ -383,7 +383,7 @@ jaimages_DATA = \
docs/manual/ja/images/xfce4-screenshooter-zimagez-result-dialog.png
# Turkish documentation
-trdocdir = $(datadir)/xfce4/doc/tr
+trdocdir = $(docdir)/html/tr
trdoc_DATA = docs/manual/tr/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -392,7 +392,7 @@ docs/manual/tr/xfce4-screenshooter.html:
endif
endif
-trimagesdir = $(datadir)/xfce4/doc/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 \
@@ -401,7 +401,7 @@ trimages_DATA = \
# Siplified Chinese documentation
-zhcndocdir = $(datadir)/xfce4/doc/zh_CN
+zhcndocdir = $(docdir)/html/zh_CN
zhcndoc_DATA = docs/manual/zh_CN/xfce4-screenshooter.html
if MAINTAINER_MODE
if ENABLE_XSLTPROC
@@ -410,7 +410,7 @@ docs/manual/zh_CN/xfce4-screenshooter.ht
endif
endif
-zhcnimagesdir = $(datadir)/xfce4/doc/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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
