Hello community,
here is the log from the commit of package wmakerconf for openSUSE:Factory
checked in at Thu Jan 7 20:29:26 CET 2010.
--------
--- wmakerconf/wmakerconf.changes 2008-04-28 00:06:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/wmakerconf/wmakerconf.changes 2009-12-28 20:57:07.000000000 +0100
@@ -1,0 +2,49 @@
+Mon Dec 28 19:55:04 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.12:
+ + Sort list for shortcuts
+ + Updated translations
+- Changes from version 2.11:
+ + Finally completely ported to work with GTK+ 2 and Window Maker
+ 0.90 (Not all new Window Maker attributes are supported yet,
+ though.)
+ + Data upgrade now disabled by default, as it's broken
+ + Updated translations
+- Changes from version 2.9.2:
+ + Improved handling of specific workspaces (WorkspaceSpecificBack
+ attribute), fixing segfaults and previews
+ + Panels are now shown sorted alphabetically instead of in the
+ previous haphazard order
+- Changes from version 2.9.1:
+ + Various segfaults fixed
+ + Fixed bug causing non-alphanumeric keyboard shortcuts to be
+ ignored
+ + Fixed bug where middle and right mouse buttons were swapped in dialog
+ + Installing a theme now puts it in
+ GNUstep/Library/WindowMaker/Themes as one would expect
+ + New themes websites in "Themes" menu to replace those that have
+ ceased to exist
+ + Updated translations
+- Change gtk-devel BuildRequires to gtk2-devel.
+- Add update-desktop-files BuildRequires.
+- Add perl-libwww-perl BuildRequires and Requires.
+- Remove freetype2-devel, imlib-config, imlib-devel, lynx, wget
+ BuildRequires.
+- Remove lynx, wget Requires.
+- Drop wmakerconf-2.9-themesdir.patch: we don't use /usr/X11R6
+ anymore.
+- Rebase wmakerconf-2.9-destdir.patch.
+- Rebase wmakerconf-2.9-config.patch.
+- Drop wmakerconf-2.9-segfault.patch: fixed upstream.
+- Drop wmakerconf-rreleaseimage.patch: fixed upstream.
+- Drop wmakerconf-2.9-wmconfig.patch: fixed upstream.
+- Rebase wmakerconf-datarootdir.patch to apply without fuzz.
+- Drop wmakerconf-2.9-nb.patch: instead, move the translation after
+ installation.
+- Add wmakerconf-fix-bad-po.patch to fix build.
+- Add wmakerconf-no-imlib.patch to fix regeneration of configure
+ script without imlib-devel.
+- Add fdupes support.
+- Use makeinstall macro.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
wmakerconf-2.9-nb.patch
wmakerconf-2.9-segfault.patch
wmakerconf-2.9-themesdir.patch
wmakerconf-2.9-wmconfig.patch
wmakerconf-2.9.tar.bz2
wmakerconf-rreleaseimage.patch
New:
----
wmakerconf-2.12.tar.bz2
wmakerconf-fix-bad-po.patch
wmakerconf-no-imlib.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wmakerconf.spec ++++++
--- /var/tmp/diff_new_pack.wdRICg/_old 2010-01-07 20:29:04.000000000 +0100
+++ /var/tmp/diff_new_pack.wdRICg/_new 2010-01-07 20:29:04.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package wmakerconf (Version 2.9)
+# spec file for package wmakerconf (Version 2.12)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 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
@@ -19,27 +19,26 @@
Name: wmakerconf
-BuildRequires: WindowMaker-devel freetype2-devel gtk-devel imlib-config imlib-devel lynx wget
-License: GPL v2 or later
+BuildRequires: WindowMaker-devel fdupes gtk2-devel perl-libwww-perl update-desktop-files
+License: GPLv2+
Group: System/GUI/Other
Obsoletes: wmaconf
Provides: wmaconf
-Requires: lynx wget WindowMaker
+Requires: WindowMaker
+Requires: perl-libwww-perl
AutoReqProv: on
Summary: Configuration tool for Window Maker
-Version: 2.9
-Release: 580
-Source: http://www.windowmaker.org/pub/contrib/source/wmakerconf/wmakerconf-%{version}.tar.bz2
-Patch: wmakerconf-%{version}.dif
-Patch2: wmakerconf-%{version}-themesdir.patch
-Patch3: wmakerconf-%{version}-destdir.patch
-Patch4: wmakerconf-%{version}-config.patch
-Patch5: wmakerconf-%{version}-segfault.patch
-Patch6: wmakerconf-rreleaseimage.patch
-Patch7: wmakerconf-%{version}-varargs.diff
-Patch8: wmakerconf-%{version}-wmconfig.patch
+Version: 2.12
+Release: 1
+Url: http://wmakerconf.sourceforge.net/
+Source: %{name}-%{version}.tar.bz2
+Patch: wmakerconf-2.9.dif
+Patch1: wmakerconf-fix-bad-po.patch
+Patch3: wmakerconf-2.9-destdir.patch
+Patch4: wmakerconf-2.9-config.patch
+Patch5: wmakerconf-no-imlib.patch
+Patch7: wmakerconf-2.9-varargs.diff
Patch9: wmakerconf-datarootdir.patch
-Patch10: wmakerconf-%{version}-nb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -52,18 +51,14 @@
Ullrich Hafner
%prep
-%setup -q -n wmakerconf-%{version}
+%setup -q
%patch
-%patch2
+%patch1 -p1
%patch3
%patch4
-%patch5
-%patch6 -p1 -b .rreleaseimage
+%patch5 -p1
%patch7
-%patch8
%patch9
-%patch10
-mv po/no.po po/nb.po
# ---------------------------------------------------------------------------
%{suse_update_config -f data}
@@ -71,17 +66,20 @@
gettextize -f
autoreconf --install --force
test -f po/Makevars || mv po/Makevars.template po/Makevars
-CFLAGS="$RPM_OPT_FLAGS" \
%configure \
- --with-nlsdir=/usr/share/locale \
- --with-pixmapdir=/usr/share/WindowMaker/Pixmaps
+ --with-nlsdir=%{_datadir}/locale \
+ --with-pixmapdir=%{_datadir}/WindowMaker/Pixmaps
make
# ---------------------------------------------------------------------------
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
+# Change no to nb
+mv %{buildroot}%{_datadir}/locale/no %{buildroot}%{_datadir}/locale/nb
%find_lang %{name}
%find_lang wmakerconf-data %{name}.lang
+%suse_update_desktop_file wmakerconf
+%fdupes %{buildroot}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -89,8 +87,11 @@
%files -f %{name}.lang
%defattr(-,root,root)
%doc ABOUT-NLS AUTHORS COPYING ChangeLog MANUAL NEWS NLS-TEAM1 README TODO
-/usr/bin/mkpreview
-/usr/bin/wmakerconf
-/usr/share/wmakerconf
+%{_bindir}/mkpreview
+%{_bindir}/wmakerconf
+%doc %{_mandir}/man?/mkpreview.*
+%doc %{_mandir}/man?/wmakerconf.*
+%{_datadir}/applications/wmakerconf.desktop
+%{_datadir}/wmakerconf/
%changelog
++++++ wmakerconf-2.9.tar.bz2 -> wmakerconf-2.12.tar.bz2 ++++++
++++ 77968 lines of diff (skipped)
++++++ wmakerconf-2.9-config.patch ++++++
--- /var/tmp/diff_new_pack.wdRICg/_old 2010-01-07 20:29:05.000000000 +0100
+++ /var/tmp/diff_new_pack.wdRICg/_new 2010-01-07 20:29:05.000000000 +0100
@@ -1,6 +1,8 @@
---- configure.in
-+++ configure.in
-@@ -132,7 +132,10 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -121,7 +121,10 @@ if test "$x_libraries" != "NONE"; then
fi
# Add some common include and library path's
@@ -12,11 +14,12 @@
LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib -L$wprefix/lib"
# Checks for socket and nsl library, required on Solaris systems
-@@ -280,6 +283,7 @@
- AC_SUBST(INSTOBJEXT)
- INSTOBJEXT=.gmo
- AM_GNU_GETTEXT
-+AM_GNU_GETTEXT_VERSION(0.12)
-
- if test "x$gt_cv_func_gettext_libintl" = "xyes"; then
- LIBS="$LIBS -lintl"
+@@ -241,7 +244,7 @@ if test -n "$perlpath"; then
+ AC_DEFINE_UNQUOTED(PERL, "$perlpath", [Path of perl utility])
+ # Checks for libwww-perl
+ AC_MSG_CHECKING([for libwww-perl])
+- ac_try="$perlpath -c libwww.pl >/dev/null 2>conftest.out"
++ ac_try="$perlpath -c scripts/libwww.pl >/dev/null 2>conftest.out"
+ if eval $ac_try; then
+ GETSCRIPT=libwww.pl
+ AC_MSG_RESULT(yes)
++++++ wmakerconf-2.9-destdir.patch ++++++
--- /var/tmp/diff_new_pack.wdRICg/_old 2010-01-07 20:29:05.000000000 +0100
+++ /var/tmp/diff_new_pack.wdRICg/_new 2010-01-07 20:29:05.000000000 +0100
@@ -1,6 +1,8 @@
---- data/po/Makefile.am
+Index: data/po/Makefile.am
+===================================================================
+--- data/po/Makefile.am.orig
+++ data/po/Makefile.am
-@@ -61,7 +61,7 @@
+@@ -65,7 +65,7 @@ install-exec:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
@@ -9,7 +11,7 @@
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
-@@ -72,24 +72,24 @@
+@@ -76,24 +76,24 @@ install-data-yes: all
echo $$destdir; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
@@ -43,9 +45,11 @@
else \
true; \
fi; \
---- intl/Makefile.in
+Index: intl/Makefile.in
+===================================================================
+--- intl/Makefile.in.orig
+++ intl/Makefile.in
-@@ -114,26 +114,26 @@
+@@ -114,25 +114,25 @@ install-exec: all
if test "$(PACKAGE)" = "gettext" \
&& test '@INTLOBJS@' = '$(GETTOBJS)'; then \
if test -r $(MKINSTALLDIRS); then \
@@ -55,9 +59,7 @@
- $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \
fi; \
-- $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \
- $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \
-+ $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \
+ $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \
else \
: ; \
@@ -80,9 +82,11 @@
done; \
else \
: ; \
---- po/Makefile.in.in
+Index: po/Makefile.in.in
+===================================================================
+--- po/Makefile.in.in.orig
+++ po/Makefile.in.in
-@@ -111,9 +111,9 @@
+@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -r "$(MKINSTALLDIRS)"; then \
@@ -94,7 +98,7 @@
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
-@@ -125,27 +125,27 @@
+@@ -125,27 +125,27 @@ install-data-yes: all
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
if test -r "$(MKINSTALLDIRS)"; then \
@@ -132,7 +136,7 @@
else \
true; \
fi; \
-@@ -153,12 +153,12 @@
+@@ -153,12 +153,12 @@ install-data-yes: all
done
if test "$(PACKAGE)" = "gettext"; then \
if test -r "$(MKINSTALLDIRS)"; then \
++++++ wmakerconf-datarootdir.patch ++++++
--- /var/tmp/diff_new_pack.wdRICg/_old 2010-01-07 20:29:05.000000000 +0100
+++ /var/tmp/diff_new_pack.wdRICg/_new 2010-01-07 20:29:05.000000000 +0100
@@ -1,8 +1,10 @@
---- scripts/upgrade.pl.in
+Index: scripts/upgrade.pl.in
+===================================================================
+--- scripts/upgrade.pl.in.orig
+++ scripts/upgrade.pl.in
-@@ -29,6 +29,7 @@
+@@ -44,6 +44,7 @@ else
+ }
- $wwwget = "@WWWGET@";
$prefix = "@prefix@";
+$datarootdir = "@datarootdir@";
$datadir = "@DATADIR@";
++++++ wmakerconf-fix-bad-po.patch ++++++
Index: wmakerconf-2.12/po/tr.po
===================================================================
--- wmakerconf-2.12.orig/po/tr.po
+++ wmakerconf-2.12/po/tr.po
@@ -1411,35 +1411,35 @@ msgstr "Y�kleme �ndizinlemesi verilmemi�
msgid "Skip"
msgstr "Atla"
-#: src/themebrowser.c:3274
-#, c-format
-msgid ""
-"Can't unpack GNU zipped theme file\n"
-"`%s'\n"
-"to destiation file\n"
-"`%s'\n"
-"Please check `stderr' for more details."
-msgstr ""
-"GNU zipiyle s�k��t�r�lm�� dosyay�\n"
-"hedef dosyas� olan\n"
-"`%s''ye\n"
-"a�amad�m\n"
-"Hata kanal�na bak�p daha fazla bilgi edinebilirsin ."
+##: src/themebrowser.c:3274
+##, c-format
+#msgid ""
+#"Can't unpack GNU zipped theme file\n"
+#"`%s'\n"
+#"to destiation file\n"
+#"`%s'\n"
+#"Please check `stderr' for more details."
+#msgstr ""
+#"GNU zipiyle s�k��t�r�lm�� dosyay�\n"
+#"hedef dosyas� olan\n"
+#"`%s''ye\n"
+#"a�amad�m\n"
+#"Hata kanal�na bak�p daha fazla bilgi edinebilirsin ."
-#: src/themebrowser.c:3304
-#, c-format
-msgid ""
-"Can't unpack BZIP2 compressed theme file\n"
-"`%s'\n"
-"to destiation file\n"
-"`%s'\n"
-"Please check `stderr' for more details."
-msgstr ""
-"BZIP2'yle s�k��t�r�lm�� dosyay�\n"
-"hedef dosyas� olan\n"
-"`%s''ye\n"
-"a�amad�m\n"
-"Hata kanal�na bak�p daha fazla bilgi edinebilirsin ."
+##: src/themebrowser.c:3304
+##, c-format
+#msgid ""
+#"Can't unpack BZIP2 compressed theme file\n"
+#"`%s'\n"
+#"to destiation file\n"
+#"`%s'\n"
+#"Please check `stderr' for more details."
+#msgstr ""
+#"BZIP2'yle s�k��t�r�lm�� dosyay�\n"
+#"hedef dosyas� olan\n"
+#"`%s''ye\n"
+#"a�amad�m\n"
+#"Hata kanal�na bak�p daha fazla bilgi edinebilirsin ."
#: src/themebrowser.c:3337
#, c-format
++++++ wmakerconf-no-imlib.patch ++++++
Index: wmakerconf-2.12/configure.ac
===================================================================
--- wmakerconf-2.12.orig/configure.ac
+++ wmakerconf-2.12/configure.ac
@@ -175,12 +175,13 @@ AM_PATH_GTK_2_0(2.4.0,,
AC_MSG_ERROR([*** GTK >= 2.4.0 not installed - please install first ***]))
if test -z "$usewraster"; then
- AM_PATH_GDK_IMLIB(1.9.3,[AC_DEFINE(HAVE_IMLIB, 1, [Undef if you don't have the gdk_imlib library]) have_imlib="yes"], AC_MSG_WARN([*** IMLIB >= 1.9.3 not installed - please install first ***]))
+ #AM_PATH_GDK_IMLIB(1.9.3,[AC_DEFINE(HAVE_IMLIB, 1, [Undef if you don't have the gdk_imlib library]) have_imlib="yes"], AC_MSG_WARN([*** IMLIB >= 1.9.3 not installed - please install first ***]))
# workaround for imlib 1.9.2
- if test "$IMLIB_CONFIG" != "no" ; then
- IMLIB_LIBS=`$IMLIB_CONFIG --libs`
- GDK_IMLIB_LIBS="$GDK_IMLIB_LIBS $IMLIB_LIBS"
- fi
+ #if test "$IMLIB_CONFIG" != "no" ; then
+ # IMLIB_LIBS=`$IMLIB_CONFIG --libs`
+ # GDK_IMLIB_LIBS="$GDK_IMLIB_LIBS $IMLIB_LIBS"
+ #fi
+ true
else
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org