Hello community,
here is the log from the commit of package WindowMaker for openSUSE:Factory
checked in at Fri Mar 19 09:15:39 CET 2010.
--------
--- WindowMaker/WindowMaker.changes 2009-03-30 03:31:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/WindowMaker/WindowMaker.changes 2009-05-07 01:57:53.000000000 +0200
@@ -7,0 +8,5 @@
+Thu Feb 12 17:16:44 CET 2009 - nadvornik@suse.cz
+
+- updated to development snapshot
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
WindowMaker-0.92.0.tar.bz2
WindowMaker-exec.patch
WindowMaker-fullscreen.patch
WindowMaker-refcount.patch
WindowMaker-wmspec.c-icon.patch
WindowMaker-wmspec.c.patch
New:
----
Window-Maker-5a2507602c48.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ WindowMaker.spec ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package WindowMaker (Version 0.92.0)
#
-# 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
@@ -20,7 +20,7 @@
Name: WindowMaker
BuildRequires: freetype2-devel gcc-c++ giflib-devel libpng-devel libtiff-devel update-desktop-files xorg-x11-devel
-License: GPL v2 or later; LGPL v2.1 or later; Public Domain, Freeware
+License: GPLv2+ ; LGPLv2.1+ ; Public Domain, Freeware
Group: System/GUI/Other
Url: http://www.windowmaker.info/
Obsoletes: wmaker
@@ -29,8 +29,8 @@
AutoReqProv: on
Summary: A Colorful and Flexible Window Manager
Version: 0.92.0
-Release: 206
-Source: WindowMaker-%{version}.tar.bz2
+Release: 207
+Source: Window-Maker-5a2507602c48.tar.bz2
Source1: WindowMaker-extra-0.1.tar.bz2
Source2: SuSE-theme.tar.bz2
Source4: README.SuSE
@@ -41,18 +41,13 @@
Patch2: WindowMaker-menu.patch
Patch22: WindowMaker-warnings.patch
Patch24: WindowMaker-nb-locale.patch
-Patch25: WindowMaker-wmspec.c.patch
Patch26: WindowMaker-null.patch
Patch27: WindowMaker-de_translation.patch
-Patch28: WindowMaker-wmspec.c-icon.patch
Patch29: WindowMaker-asm.patch
-Patch30: WindowMaker-fullscreen.patch
Patch31: WindowMaker-MAX_WORKSPACENAME_WIDTH.patch
Patch32: WindowMaker-0.92.0-printf.diff
-Patch33: WindowMaker-refcount.patch
Patch34: WindowMaker-crash.patch
Patch35: WindowMaker-fonts.patch
-Patch36: WindowMaker-exec.patch
Patch37: WindowMaker-event.patch
Patch38: WindowMaker-wmspec.c-findBestIcon.patch
Patch39: WindowMaker-dir-specification.patch
@@ -60,7 +55,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package devel
-License: GPL v2 or later
+License: GPLv2+
Requires: %{name} = %{version} libtiff-devel libjpeg-devel xorg-x11-devel libpng-devel zlib-devel giflib-devel
Summary: Includes and static libraries for Window Maker
Group: Development/Libraries/X11
@@ -86,25 +81,20 @@
Alfredo K. Kojima
%prep
-%setup -q -n WindowMaker-%{version} -a 1
+%setup -q -n Window-Maker-5a2507602c48 -a 1
mkdir menu.orig
cp WindowMaker/{menu.*,plmenu.*} menu.orig
%patch1
%patch2
%patch22
%patch24
-%patch25
%patch26 -p1
%patch27
-%patch28
-%patch29
-%patch30
+#patch29
%patch31
%patch32
-%patch33 -p1
%patch34
%patch35
-%patch36
%patch37
%patch38
%patch39
@@ -149,6 +139,7 @@
#----------------------------------------------------------------------
# not packaged
rm -f $RPM_BUILD_ROOT/%{_mandir}/sk/man1/*
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
# install kdm/gdm entry
install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/
install -m 0644 %SOURCE5 $RPM_BUILD_ROOT/usr/share/xsessions/
@@ -157,7 +148,6 @@
%find_lang %{name}
%find_lang WINGs %{name}.lang
%find_lang WPrefs %{name}.lang
-%{__rm} -fv %{buildroot}%{_libdir}/*.la
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -188,6 +178,5 @@
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
%{_libdir}/*.so
-%{_libdir}/*.a
%changelog
++++++ WindowMaker-0.92.0-printf.diff ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,6 +1,6 @@
--- src/misc.c
+++ src/misc.c
-@@ -733,7 +733,7 @@
+@@ -696,7 +696,7 @@
olen = len+1;
out = malloc(olen);
if (!out) {
@@ -9,7 +9,7 @@
return NULL;
}
*out = 0;
-@@ -821,7 +821,8 @@
+@@ -785,7 +785,8 @@
olen += slen;
nout = realloc(out,olen);
if (!nout) {
@@ -19,7 +19,7 @@
goto error;
}
out = nout;
-@@ -871,7 +872,8 @@
+@@ -835,7 +836,8 @@
olen += slen;
nout = realloc(out,olen);
if (!nout) {
++++++ WindowMaker-composite.patch ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,6 +1,6 @@
--- src/main.c
+++ src/main.c
-@@ -835,6 +835,17 @@
+@@ -747,6 +747,17 @@
exit(1);
}
++++++ WindowMaker-crash.patch ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,6 +1,6 @@
--- src/misc.c
+++ src/misc.c
-@@ -1141,7 +1141,7 @@
+@@ -1105,7 +1105,7 @@
len = (msg ? strlen(msg) : 0) + (workspace >=0 ? 4 : 0) + 1 ;
buffer = wmalloc(len+5);
++++++ WindowMaker-de_translation.patch ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,11 +1,11 @@
--- po/de.po
+++ po/de.po
-@@ -70,7 +70,7 @@
- #: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
+@@ -76,7 +76,7 @@
+ #: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
#: ../src/rootmenu.c:264 ../src/winmenu.c:508
msgid "Kill"
-msgstr "Töten"
+msgstr "Beenden"
- #: ../src/appicon.c:519 ../src/dock.c:3501
+ #: ../src/appicon.c:508 ../src/dock.c:3511
msgid "Unhide"
++++++ WindowMaker-menu.patch ++++++
++++ 619 lines (skipped)
++++ between WindowMaker/WindowMaker-menu.patch
++++ and /mounts/work_src_done/STABLE/WindowMaker/WindowMaker-menu.patch
++++++ WindowMaker-nb-locale.patch ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,6 +1,6 @@
--- configure.ac
+++ configure.ac
-@@ -281,7 +281,7 @@
+@@ -292,7 +292,7 @@
dnl List of supported locales
dnl -------------------------
++++++ WindowMaker-null.patch ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,6 +1,6 @@
---- WindowMaker-0.92.0/WINGs/wfontpanel.c
-+++ WindowMaker-0.92.0/WINGs/wfontpanel.c
-@@ -584,7 +584,7 @@
+--- Window-Maker-5a2507602c48/WINGs/wfontpanel.c
++++ Window-Maker-5a2507602c48/WINGs/wfontpanel.c
+@@ -585,7 +585,7 @@
int i;
pat = FcPatternCreate();
++++++ WindowMaker-warnings.patch ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -28,19 +28,9 @@
char* wfindfile(char *paths, char *file);
---- WINGs/dragsource.c
-+++ WINGs/dragsource.c
-@@ -448,6 +448,7 @@
- XDND_TIMESTAMP(info),
- XDND_SOURCE_ACTION(info));
- }
-+ return True;
- } else {
- /* send position on each move */
- return sendDnDClientMessage(info, scr->xdndPositionAtom,
--- WINGs/wcolorpanel.c
+++ WINGs/wcolorpanel.c
-@@ -1247,7 +1247,7 @@
+@@ -1239,7 +1239,7 @@
}
if (!(dPtr = opendir(panel->configurationPath))) {
@@ -49,25 +39,7 @@
return;
}
-@@ -1283,7 +1283,7 @@
- WMListItem *item;
-
- if (stat(RGBTXT, &stat_buf) != 0) {
-- wsyserror(_("Color Panel: Could not find file"), " %s", RGBTXT);
-+ wsyserror(_("Color Panel: Could not find file %s"), RGBTXT);
- return;
- }
- else {
-@@ -1301,7 +1301,7 @@
- fclose(rgbtxt);
- }
- else {
-- wsyserror(_("Color Panel: Could not find file"), "%s", RGBTXT);
-+ wsyserror(_("Color Panel: Could not find file %s"), RGBTXT);
- }
- }
- }
-@@ -3746,6 +3746,7 @@
+@@ -3715,6 +3715,7 @@
color.red = 0;
color.green = 0;
color.blue = 0;
@@ -75,7 +47,7 @@
return color;
}
-@@ -3755,6 +3756,7 @@
+@@ -3724,6 +3725,7 @@
color.red = xcolor->red >> 8;
color.green = xcolor->green >> 8;
color.blue = xcolor->blue >> 8;
@@ -93,16 +65,17 @@
#include
#include
#include
---- src/startup.c
-+++ src/startup.c
-@@ -25,6 +25,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
+--- src/dock.c
++++ src/dock.c
+@@ -3780,7 +3780,7 @@
+
+
+ if (wPreferences.flags.noupdates)
+- return;
++ return False;
+
+ if (XGrabPointer(dpy, icon->core->window, True, ButtonMotionMask
+ |ButtonReleaseMask|ButtonPressMask, GrabModeAsync,
--- src/texture.c
+++ src/texture.c
@@ -421,6 +421,8 @@
++++++ WindowMaker-wmspec.c-findBestIcon.patch ++++++
--- /var/tmp/diff_new_pack.L938ty/_old 2010-03-19 09:15:18.000000000 +0100
+++ /var/tmp/diff_new_pack.L938ty/_new 2010-03-19 09:15:18.000000000 +0100
@@ -1,6 +1,6 @@
--- src/wmspec.c
+++ src/wmspec.c
-@@ -401,7 +401,7 @@
+@@ -402,7 +402,7 @@
* results in better overall aesthetics -Dan */
wanted = wPreferences.icon_size * wPreferences.icon_size;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org