Hello community,

here is the log from the commit of package xfce4-panel-plugin-mailwatch for 
openSUSE:12.1 checked in at 2011-10-25 17:20:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1/xfce4-panel-plugin-mailwatch (Old)
 and      /work/SRC/openSUSE:12.1/.xfce4-panel-plugin-mailwatch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xfce4-panel-plugin-mailwatch", Maintainer is 
"xfce-maintain...@suse.de"

Changes:
--------
--- 
/work/SRC/openSUSE:12.1/xfce4-panel-plugin-mailwatch/xfce4-panel-plugin-mailwatch.changes
   2011-10-24 13:35:05.000000000 +0200
+++ 
/work/SRC/openSUSE:12.1/.xfce4-panel-plugin-mailwatch.new/xfce4-panel-plugin-mailwatch.changes
      2011-10-28 19:11:50.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Oct 20 21:49:35 UTC 2011 - g...@opensuse.org
+
+- added xfce4-panel-plugin-mailwatch-1.1.0-use-docdir.patch in
+  order to use docdir correctly
+- install HTML documentation below
+  /usr/share/xfce4/xfce4-mailwatch-plugin/html/
+- package AUTHORS ChangeLog COPYING NEWS README TODO
+
+-------------------------------------------------------------------

New:
----
  xfce4-panel-plugin-mailwatch-1.1.0-use-docdir.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xfce4-panel-plugin-mailwatch.spec ++++++
--- /var/tmp/diff_new_pack.ak4ahG/_old  2011-10-28 19:11:50.000000000 +0200
+++ /var/tmp/diff_new_pack.ak4ahG/_new  2011-10-28 19:11:50.000000000 +0200
@@ -32,9 +32,13 @@
 Patch1:         xfce4-panel-plugin-mailwatch-1.1.0-fix-build-with-4.7.patch
 # PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-fix-gnutls-3.0.3.patch 
bxo#7998 g...@opensuse.org -- Fix build with gnutls >= 3.0.3, a lowat level of 
0 is the default in gnutls >= 2.12.0 and gnutls_transport_set_lowat() has been 
removed in 3.0.3
 Patch2:         xfce4-panel-plugin-mailwatch-1.1.0-fix-gnutls-3.0.3.patch
+# PATCH-FIX-UPSTREAM xfce4-panel-plugin-mailwatch-1.1.0-use-docdir.patch 
g...@opensuse.org -- Use docdir correctly
+Patch3:         xfce4-panel-plugin-mailwatch-1.1.0-use-docdir.patch
 Group:          System/GUI/XFCE
 BuildRequires:  intltool
 BuildRequires:  fdupes
+BuildRequires:  libxslt
+BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  pkgconfig(libxfce4panel-1.0)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  xfce4-dev-tools
@@ -53,11 +57,16 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 xdt-autogen
 export LIBS="-lgcrypt"
-%configure --with-pic --disable-static
+%configure \
+    --docdir=%{_datadir}/xfce4/xfce4-mailwatch-plugin \
+    --enable-maintainer-mode \
+    --with-pic \
+    --disable-static
 make %{_smp_mflags} V=1
 
 %install
@@ -80,13 +89,12 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%dir %{_datadir}/xfce4
+%dir %{_datadir}/xfce4/xfce4-mailwatch-plugin
+%doc %{_datadir}/xfce4/xfce4-mailwatch-plugin/html/
 %{_libexecdir}/xfce4/panel-plugins/xfce4-mailwatch-plugin
 %{_datadir}/icons/hicolor/*/apps/xfce-n*mail.*
 %{_datadir}/xfce4/panel-plugins/mailwatch.desktop
-%doc %dir %{_datadir}/xfce4/doc
-%doc %dir %{_datadir}/xfce4/doc/*
-%doc %dir %{_datadir}/xfce4/doc/*/images
-%doc %{_datadir}/xfce4/doc/*/*mailwatch*.html
-%doc %{_datadir}/xfce4/doc/*/images/*mailwatch*
 
 %changelog

++++++ xfce4-panel-plugin-mailwatch-1.1.0-use-docdir.patch ++++++
Index: xfce4-mailwatch-plugin-1.1.0/doc/C/Makefile.am
===================================================================
--- xfce4-mailwatch-plugin-1.1.0.orig/doc/C/Makefile.am
+++ xfce4-mailwatch-plugin-1.1.0/doc/C/Makefile.am
@@ -3,10 +3,10 @@ SUBDIRS = \
 
 noinst_DATA = xfce4-mailwatch-plugin.xml
 
-docdir = $(datadir)/xfce4/doc/C
-doc_DATA = xfce4-mailwatch-plugin.html
+cdocdir = $(docdir)/html/C
+cdoc_DATA = xfce4-mailwatch-plugin.html
 
-EXTRA_DIST = $(noinst_DATA) $(doc_DATA)
+EXTRA_DIST = $(noinst_DATA) $(cdoc_DATA)
 
 html: $(srcdir)/xfce4-mailwatch-plugin.xml
        xsltproc $(top_srcdir)/doc/xfce-nochunk.xsl \
Index: xfce4-mailwatch-plugin-1.1.0/doc/C/images/Makefile.am
===================================================================
--- xfce4-mailwatch-plugin-1.1.0.orig/doc/C/images/Makefile.am
+++ xfce4-mailwatch-plugin-1.1.0/doc/C/images/Makefile.am
@@ -1,5 +1,5 @@
-imagesdir = $(datadir)/xfce4/doc/C/images
-images_DATA = \
+cimagesdir = $(docdir)/html/C/images
+cimages_DATA = \
        mailwatch-gmail-settings.png \
        mailwatch-imap-advanced.png \
        mailwatch-imap-new-folders.png \
@@ -14,4 +14,4 @@ images_DATA = \
        mailwatch-pop3-settings.png \
        mailwatch-properties.png
 
-EXTRA_DIST = $(images_DATA)
+EXTRA_DIST = $(cimages_DATA)
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to