Hello community, here is the log from the commit of package xarchiver for openSUSE:Factory checked in at 2011-10-25 17:19:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xarchiver (Old) and /work/SRC/openSUSE:Factory/.xarchiver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xarchiver", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xarchiver/xarchiver.changes 2011-09-23 12:50:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xarchiver.new/xarchiver.changes 2011-10-28 15:27:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 21 12:42:34 UTC 2011 - [email protected] + +- extended xarchiver-0.5.2+20090319-honor-docdir.patch to + prevent the installation of README, ChangeLog etc. under docdir +- install HTML documentation under /usr/share/xfce4/xarchiver/html + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xarchiver.spec ++++++ --- /var/tmp/diff_new_pack.u7mIBD/_old 2011-10-28 15:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.u7mIBD/_new 2011-10-28 15:28:40.000000000 +0200 @@ -26,6 +26,7 @@ Group: Productivity/Archiving/Compression Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.1 +# PATCH-FIX-OPENSUSE xarchiver-0.5.2+20090319-honor-docdir.patch [email protected] -- Install documentation under docdir and do not install README, ChangeLog etc. Patch0: xarchiver-0.5.2+20090319-honor-docdir.patch BuildRequires: fdupes BuildRequires: intltool @@ -59,7 +60,7 @@ %build xdt-autogen -%configure --docdir=%{_defaultdocdir}/%{name} +%configure --docdir=%{_datadir}/xfce4/xarchiver/html make %{?_smp_mflags} %install @@ -86,13 +87,16 @@ %files -f %{name}.lang %defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog README NEWS %{_bindir}/xarchiver %{_libexecdir}/thunar-archive-plugin %{_datadir}/applications/xarchiver.desktop %{_datadir}/icons/*/*/*/* %{_datadir}/pixmaps/xarchiver/ %{_datadir}/pixmaps/xarchiver.png +%dir %{_datadir}/xfce4 +%dir %{_datadir}/xfce4/xarchiver +%doc %{_datadir}/xfce4/xarchiver/html/ %doc %{_mandir}/man1/xarchiver.1* -%doc %{_defaultdocdir}/%{name} %changelog ++++++ xarchiver-0.5.2+20090319-honor-docdir.patch ++++++ --- /var/tmp/diff_new_pack.u7mIBD/_old 2011-10-28 15:28:40.000000000 +0200 +++ /var/tmp/diff_new_pack.u7mIBD/_new 2011-10-28 15:28:40.000000000 +0200 @@ -1,9 +1,48 @@ -diff -ur xarchiver-0.5.2+20090319.orig/doc/Makefile.am xarchiver-0.5.2+20090319/doc/Makefile.am ---- xarchiver-0.5.2+20090319.orig/doc/Makefile.am 2009-03-19 11:12:47.000000000 +0100 -+++ xarchiver-0.5.2+20090319/doc/Makefile.am 2010-12-27 00:13:26.000000000 +0100 +Index: xarchiver-0.5.2+20090319/doc/Makefile.am +=================================================================== +--- xarchiver-0.5.2+20090319.orig/doc/Makefile.am ++++ xarchiver-0.5.2+20090319/doc/Makefile.am @@ -1,4 +1,4 @@ -DOCDIR = $(DESTDIR)$(datadir)/doc/@PACKAGE@ +DOCDIR = $(DESTDIR)$(docdir) HTML_FILES = \ html/ch01.html \ html/ch01s02.html \ +@@ -67,10 +67,4 @@ install-data-local: + $(INSTALL_DATA) $(srcdir)/$$file $(DOCDIR)/html/images/$$basefile; \ + fi \ + done +- $(INSTALL_DATA) $(top_srcdir)/README $(DOCDIR) +- $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DOCDIR) +- $(INSTALL_DATA) $(top_srcdir)/NEWS $(DOCDIR) +- $(INSTALL_DATA) $(top_srcdir)/COPYING $(DOCDIR) +- $(INSTALL_DATA) $(top_srcdir)/AUTHORS $(DOCDIR) +- $(INSTALL_DATA) $(top_srcdir)/TODO $(DOCDIR) + +Index: xarchiver-0.5.2+20090319/src/window.c +=================================================================== +--- xarchiver-0.5.2+20090319.orig/src/window.c ++++ xarchiver-0.5.2+20090319/src/window.c +@@ -1955,7 +1955,7 @@ gboolean xa_launch_external_program(gcha + + void xa_show_help (GtkMenuItem *menuitem,gpointer user_data) + { +- gchar *uri = g_strconcat ("file://",DATADIR,"/doc/",PACKAGE,"/html/index.html",NULL); ++ gchar *uri = g_strconcat ("file://",DOCDIR,"/html/index.html",NULL); + xa_activate_link (NULL,uri,NULL); + g_free (uri); + } +Index: xarchiver-0.5.2+20090319/src/Makefile.am +=================================================================== +--- xarchiver-0.5.2+20090319.orig/src/Makefile.am ++++ xarchiver-0.5.2+20090319/src/Makefile.am +@@ -34,7 +34,8 @@ xarchiver_CFLAGS = \ + @GLIB_CFLAGS@ \ + -DDATADIR=\"$(datadir)\" \ + -DSRCDIR=\"$(top_srcdir)\" \ +- -DLOCALEDIR=\"$(localedir)\" ++ -DLOCALEDIR=\"$(localedir)\" \ ++ -DDOCDIR=\"$(docdir)\" + + xarchiver_LDADD = \ + $(top_builddir)/src/xdgmime/libxdgmime.la \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
