commit xarchiver for openSUSE:12.1:Update:Test

2012-01-12 Thread h_root 
Hello community,

here is the log from the commit of package xarchiver for 
openSUSE:12.1:Update:Test checked in at 2012-01-12 16:02:11

Comparing /work/SRC/openSUSE:12.1:Update:Test/xarchiver (Old)
 and  /work/SRC/openSUSE:12.1:Update:Test/.xarchiver.new (New)


Package is "xarchiver", Maintainer is "xfce-maintain...@suse.de"

Changes:

--- /work/SRC/openSUSE:12.1:Update:Test/xarchiver/xarchiver.changes 
2012-01-12 16:02:11.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.xarchiver.new/xarchiver.changes
2012-01-12 16:02:12.0 +0100
@@ -1,0 +2,7 @@
+Tue Jan 10 16:03:14 UTC 2012 - g...@opensuse.org
+
+- added xarchiver-fix-double-escaping.patch in order to fix double
+  escaping of filenames passed to the --add-to commandline option
+  (bnc#723170)
+
+---

New:

  xarchiver-fix-double-escaping.patch



Other differences:
--
++ xarchiver.spec ++
--- /var/tmp/diff_new_pack.Ur02sd/_old  2012-01-12 16:02:12.0 +0100
+++ /var/tmp/diff_new_pack.Ur02sd/_new  2012-01-12 16:02:12.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package xarchiver
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,28 +15,28 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:   xarchiver
 Version:0.5.2+20090319
-Release:11
-License:GPLv2+
+Release:0
 Summary:Lightweight, desktop-independent archive manager
-Url:http://xarchiver.sourceforge.net/
+License:GPL-2.0+
 Group:  Productivity/Archiving/Compression
+Url:http://xarchiver.sourceforge.net/
 Source0:%{name}-%{version}.tar.bz2
 Source1:%{name}.1
 # PATCH-FIX-OPENSUSE xarchiver-0.5.2+20090319-honor-docdir.patch 
g...@opensuse.org -- Install documentation under docdir and do not install 
README, ChangeLog etc.
 Patch0: xarchiver-0.5.2+20090319-honor-docdir.patch
+# PATCH-FIX-UPSTREAM xarchiver-fix-double-escaping.patch bnc#723170 
g...@opensuse.org -- Fix double escaping of filenames passed to the --add-to 
commandline option
+Patch1: xarchiver-fix-double-escaping.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
+BuildRequires:  startup-notification
+BuildRequires:  update-desktop-files
+BuildRequires:  xfce4-dev-tools
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  pkgconfig(pango)
-BuildRequires:  startup-notification
-BuildRequires:  update-desktop-files
-BuildRequires:  xfce4-dev-tools
 Recommends: bzip2
 Recommends: gzip
 Recommends: p7zip
@@ -55,6 +55,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 # fix spurious executable permissions of some debug files
 chmod -x src/mime.*
 

++ xarchiver-fix-double-escaping.patch ++
diff --git a/src/main.c b/src/main.c
index a13d737..07b4824 100644
--- a/src/main.c
+++ b/src/main.c
@@ -208,13 +208,13 @@ int main (int argc, char **argv)
g_free(_current_dir);
GSList *files = NULL;
_current_dir = g_path_get_basename(add_files);
-   files = 
g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
+   files = 
g_slist_append(files,g_strdup(_current_dir));
g_free(_current_dir);
g_free(add_files);
for (x = 1; x< argc; x++)
{
_current_dir = 
g_path_get_basename(argv[x]);
-   files = 
g_slist_append(files,xa_escape_filename(_current_dir,"$'`\"\\!?* ()[]&|:;<>#"));
+   files = 
g_slist_append(files,g_strdup(_current_dir));
g_free (_current_dir);
}
xa_execute_add_commands(archive,files,NULL);
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit xarchiver for openSUSE:12.1

2011-10-28 Thread h_root 
Hello community,

here is the log from the commit of package xarchiver for openSUSE:12.1 checked 
in at 2011-10-25 17:19:41

Comparing /work/SRC/openSUSE:12.1/xarchiver (Old)
 and  /work/SRC/openSUSE:12.1/.xarchiver.new (New)


Package is "xarchiver", Maintainer is "xfce-maintain...@suse.de"

Changes:

--- /work/SRC/openSUSE:12.1/xarchiver/xarchiver.changes 2011-10-24 
13:33:26.0 +0200
+++ /work/SRC/openSUSE:12.1/.xarchiver.new/xarchiver.changes2011-10-28 
19:11:43.0 +0200
@@ -1,0 +2,7 @@
+Fri Oct 21 12:42:34 UTC 2011 - g...@opensuse.org
+
+- 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.a6Qi3i/_old  2011-10-28 19:11:44.0 +0200
+++ /var/tmp/diff_new_pack.a6Qi3i/_new  2011-10-28 19:11:44.0 +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 
g...@opensuse.org -- 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.a6Qi3i/_old  2011-10-28 19:11:44.0 +0200
+++ /var/tmp/diff_new_pack.a6Qi3i/_new  2011-10-28 19:11:44.0 +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.0 +0100
-+++ xarchiver-0.5.2+20090319/doc/Makefile.am   2010-12-27 00:13:26.0 
+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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org