Hello community,
here is the log from the commit of package icewm for openSUSE:Factory
checked in at Sun Mar 7 10:57:43 CET 2010.
--------
--- icewm/icewm-lite.changes 2009-09-07 16:10:03.000000000 +0200
+++ /mounts/work_src_done/STABLE/icewm/icewm-lite.changes 2010-01-26 16:51:32.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Jan 26 16:10:38 CET 2010 - mmarek@suse.cz
+
+- fix applying of custom window options.
+
+-------------------------------------------------------------------
+Tue Jan 26 13:39:57 CET 2010 - mmarek@suse.cz
+
+- update to 1.3.6
+ * XRANDR support
+ * uses gdk-pixbuf instead of imlib
+
+-------------------------------------------------------------------
icewm.changes: same change
calling whatdependson for head-i586
Old:
----
icewm-1.2.30-strict-aliasing.patch
icewm-1.2.36-gnome-compilation.patch
icewm-1.2.38pre1-bad-delete.patch
icewm-1.2.38pre1.tar.bz2
icewm-LANG.menu.patch
New:
----
icewm-1.3.6-winoptions.patch
icewm-1.3.6.tar.bz2
icewm-lite.desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icewm-lite.spec ++++++
--- /var/tmp/diff_new_pack.D9kJ1t/_old 2010-03-07 10:57:26.000000000 +0100
+++ /var/tmp/diff_new_pack.D9kJ1t/_new 2010-03-07 10:57:26.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package icewm-lite (Version 1.2.38)
+# spec file for package icewm-lite (Version 1.3.6)
#
-# 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,26 +20,25 @@
Name: icewm-lite
BuildRequires: freetype2-devel gcc-c++ xorg-x11-devel
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Group: System/GUI/Other
Provides: icewm-bin
Requires: icewm
Conflicts: icewm-default
AutoReqProv: on
-Version: 1.2.38
-Release: 2
-%define real_version 1.2.38pre1
-Source: icewm-%{real_version}.tar.bz2
-Patch0: icewm-LANG.menu.patch
+Version: 1.3.6
+Release: 1
+Source: icewm-%version.tar.bz2
+Source1: %{name}.desktop
Patch1: icewm-multiByte.patch
Patch2: icewm-menu.patch
Patch3: icewm-docdir.patch
-Patch4: icewm-1.2.30-strict-aliasing.patch
-Patch5: icewm-1.2.35-override-config.patch
-Patch8: icewm-1.2.35-empty-winmenu.patch
-Patch9: icewm-1.2.35-unaligned-access.patch
-Patch10: icewm-1.2.36-gnome-compilation.patch
-Patch11: icewm-1.2.38pre1-bad-delete.patch
+Patch4: icewm-1.2.35-override-config.patch
+Patch5: icewm-1.2.35-empty-winmenu.patch
+Patch6: icewm-1.2.35-unaligned-access.patch
+Patch7: icewm-1.3.6-winoptions.patch
+# applied in %%build
+Patch99: icewm-preferences.patch
Url: http://www.icewm.org/
Summary: IceWM Window Manager--Lite Version
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -60,17 +59,14 @@
Marko Macek
%prep
-%setup -q -n icewm-%real_version
-%patch0 -p1
+%setup -q -n icewm-%version
%patch1
%patch2
%patch3
%patch4
%patch5
-%patch8
-%patch9
-%patch10 -p1
-%patch11 -p1
+%patch6
+%patch7 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
++++++ icewm.spec ++++++
--- /var/tmp/diff_new_pack.D9kJ1t/_old 2010-03-07 10:57:26.000000000 +0100
+++ /var/tmp/diff_new_pack.D9kJ1t/_new 2010-03-07 10:57:26.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package icewm (Version 1.2.38)
+# spec file for package icewm (Version 1.3.6)
#
-# 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,30 +19,26 @@
Name: icewm
-BuildRequires: gcc-c++ giflib-devel gnome-desktop-devel imlib-devel libgnomeui-devel libtiff-devel update-desktop-files
+BuildRequires: gcc-c++ gnome-desktop-devel libgnomeui-devel update-desktop-files
%if 0%{?suse_version} >= 1030
BuildRequires: fdupes
%endif
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Group: System/GUI/Other
Provides: windowmanager
Requires: icewm-bin, xdg-menu, desktop-data
AutoReqProv: on
-Version: 1.2.38
-Release: 2
-%define real_version 1.2.38pre1
-Source: icewm-%{real_version}.tar.bz2
+Version: 1.3.6
+Release: 1
+Source: icewm-%version.tar.bz2
Source1: %{name}.desktop
-Patch0: icewm-LANG.menu.patch
Patch1: icewm-multiByte.patch
Patch2: icewm-menu.patch
Patch3: icewm-docdir.patch
-Patch4: icewm-1.2.30-strict-aliasing.patch
-Patch5: icewm-1.2.35-override-config.patch
-Patch8: icewm-1.2.35-empty-winmenu.patch
-Patch9: icewm-1.2.35-unaligned-access.patch
-Patch10: icewm-1.2.36-gnome-compilation.patch
-Patch11: icewm-1.2.38pre1-bad-delete.patch
+Patch4: icewm-1.2.35-override-config.patch
+Patch5: icewm-1.2.35-empty-winmenu.patch
+Patch6: icewm-1.2.35-unaligned-access.patch
+Patch7: icewm-1.3.6-winoptions.patch
# applied in %%build
Patch99: icewm-preferences.patch
Url: http://www.icewm.org/
@@ -63,7 +59,7 @@
Marko Macek
%package default
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Summary: Window Manager with a Taskbar--Default Version
Group: System/GUI/Other
Provides: icewm-bin
@@ -84,7 +80,7 @@
Marko Macek
%package gnome
-License: LGPL v2.1 or later
+License: LGPLv2.1+
Summary: Windowmanager with Taskbar - gnome version
Group: System/GUI/GNOME
Requires: icewm-default
@@ -104,17 +100,14 @@
Marko Macek
%prep
-%setup -q -n icewm-%real_version
-%patch0 -p1
+%setup -q
%patch1
%patch2
%patch3
%patch4
%patch5
-%patch8
-%patch9
-%patch10 -p1
-%patch11 -p1
+%patch6
+%patch7 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
++++++ icewm-1.3.6-winoptions.patch ++++++
---
src/wmframe.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- icewm-1.3.6.orig/src/wmframe.cc
+++ icewm-1.3.6/src/wmframe.cc
@@ -2264,15 +2264,15 @@ void YFrameWindow::getWindowOptions(Wind
if (name != null) {
ustring klass_instance = name.append(".").append(klass);
list->mergeWindowOption(opt, klass_instance, remove);
- } else
- list->mergeWindowOption(opt, klass, remove);
+ }
+ list->mergeWindowOption(opt, klass, remove);
}
if (name != null) {
if (role != null) {
ustring name_role = name.append(".").append(role);
list->mergeWindowOption(opt, name_role, remove);
- } else
- list->mergeWindowOption(opt, name, remove);
+ }
+ list->mergeWindowOption(opt, name, remove);
}
if (role != null)
list->mergeWindowOption(opt, role, remove);
++++++ icewm-1.2.38pre1.tar.bz2 -> icewm-1.3.6.tar.bz2 ++++++
++++ 93587 lines of diff (skipped)
++++++ icewm-docdir.patch ++++++
--- /var/tmp/diff_new_pack.D9kJ1t/_old 2010-03-07 10:57:27.000000000 +0100
+++ /var/tmp/diff_new_pack.D9kJ1t/_new 2010-03-07 10:57:27.000000000 +0100
@@ -1,8 +1,11 @@
-Index: Makefile.in
-===================================================================
+---
+ Makefile.in | 10 +++++-----
+ src/Makefile.in | 2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
--- Makefile.in.orig
+++ Makefile.in
-@@ -121,12 +121,12 @@ install-base: base
+@@ -116,12 +116,12 @@ install-base: base
install-docs: docs
@echo ------------------------------------------
@@ -20,16 +23,14 @@
@echo ------------------------------------------
install-nls: nls
-Index: src/Makefile.in
-===================================================================
--- src/Makefile.in.orig
+++ src/Makefile.in
-@@ -33,7 +33,7 @@ DEFS = @DEFS@ \
+@@ -32,7 +32,7 @@ DEFS = @DEFS@ \
-DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
-DICESMEXE='"icewm-session$(EXEEXT)"' \
-DICEHELPEXE='"icehelp$(EXEEXT)"' \
- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
+ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"'
- CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
+ CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) `pkg-config gdk-pixbuf-xlib-2.0 --cflags` \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
++++++ icewm-lite.desktop ++++++
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=icewm-session
TryExec=icewm-session
Name=IceWM
Name[af]=Icewm
Name[eo]=GlaciFA
Name[hi]=आइस-डबल्यूएम
Name[lo]=ຕົວຈັດການຫນ້າຕ່າງ IceWM
Name[sv]=Ice WM
Name[th]=ตัวจัดการหน้าต่าง IceWM
Name[xx]=xxIceWMxx
Comment=A Windows 95-OS/2-Motif-like window manager
Comment[ar]=مدير نوافذ مشابه لـ Win95-OS/2-Motif
Comment[be]=Кіраваньне вокнамі падобнае на Windows 95-OS/2-Motif
Comment[bn]=Windows 95-OS/2-Motif-এর অনুরূপ একটি উইণ্ডো ম্যানেজার
Comment[bs]=Window manager nalik na Windows 95-OS/2-Motif
Comment[ca]=Un gestor de finestres com els de Windows 95-OS/2-Motif
Comment[cs]=Správce oken podobný Windows 95-OS/2-Motif
Comment[cy]=Trefnydd ffenestri sy'n debyg i Windows95-OS/2-Motif
Comment[da]=En Windows 95-OS/2-Motif-lignende vindueshåndtering
Comment[de]=Fenstermanager im Stil von Windows 95, OS/2 und Motif
Comment[el]=Ένας διαχειριστής παραθύρων παρόμοιος με τα Windows 95-OS/2-Motif
Comment[eo]=Fenestroadministrilo kiel Vindozo 95, OS/2 kaj Motifo
Comment[es]=Un administrador de ventanas similar a Win95-OS/2-Motif
Comment[et]=Aknahaldur, mis näeb välja nagu Windows 95-OS/2-Motif
Comment[eu]=Windows 95 OS/2 Motif-en itxura duen leiho kudeatzailea
Comment[fi]=Windows 95:n ja OS/2-Motifin tyylinen ikkunaohjelma
Comment[fr]=Un gestionnaire de fenêtres ressemblant à Windows 95-OS/2-Motif
Comment[fy]=In Win95-OS/2-Motif-likens finstersmanager
Comment[gl]=Un xestor de fiestras coma o de Windows 95-OS/2-Motif
Comment[he]=מנהל חלונות מבוסס Motif הדומה במראהו לחלונות 95/OS-2
Comment[hi]=विंडोज़ 95-ओएस/2-मोटिफ जैसा विंडो प्रबंधक
Comment[hr]=Upravitelj prozora nalik na Windows 95/OS/2/Motif
Comment[hu]=Win95-OS/2-Motif-szerű ablakkezelő
Comment[is]=Gluggastjóri sem líkist 95-OS/2-Motif
Comment[it]=Un window manager in stile Windows 95-OS/2-Motif
Comment[ja]=Windows95,OS/2,Motifに似たウィンドウマネージャ
Comment[lt]=A Windows 95-OS/2-Motif-primenanti langų tvarkyklė
Comment[lv]=Windows 95 - OS/2 - Motif līdzīgs logu menedžeris
Comment[mk]=Менаџер на прозорци со изглед на Windows 95, OS/2 и Motif
Comment[mn]=Виндовс 95-OS/2-Motif-шиг цонхны удирдагч
Comment[mt]=Window manager jixbaħ lill-Windows 95-OS/2-Motif
Comment[nb]=En vindusbehandler som likner Windows 95-OS/2-Motif
Comment[nds]=Finsterpleger, de utsüht as Windows 95-OS/2-Motif
Comment[nl]=Een Win95-OS/2-Motif-achtige windowmanager
Comment[nn]=Ein vindaugssjef som liknar Windows 95-OS/2-Motif
Comment[pa]=ਇੱਕ ਵਿੰਡੋ 95-OS/2-Motif-ਵਰਗਾ ਝਰੋਖਾ ਮੈਨੇਜਰ
Comment[pl]=Menedżer okien podobny do Windows 95-OS/2-Motif
Comment[pt]=Um gestor de janelas parecido com o Windows 95, OS/2 e Motif
Comment[pt_BR]=Um gerenciador de janelas parecido com Windows 95-OS/2-Motif
Comment[ro]=Un manager de ferestre cu aspect de Windows 95, OS/2 sau Motif
Comment[ru]=Оконный менеджер в стиле Windows95-OS/2-Motif
Comment[se]=Windows 95-OS/2-Motif-lágan lásegieđahalli
Comment[sk]=Správca okien podobný Windows 95-OS/2-Motif
Comment[sl]=Okenski upravitelj, podoben Windows 95, OS/2 in Motifu
Comment[sr]=Менаџер прозора налик на Windows 95/OS/2/Motif
Comment[sr@Latn]=Menadžer prozora nalik na Windows 95/OS/2/Motif
Comment[sv]=Fönsterhanterare som liknar Windows 95-OS/2-Motif
Comment[ta]=சாளரங்கள் 95-OS/2-மாடிஃப்-லைக் சாளர மேலாளர்
Comment[tg]=Windows 95-OS/2-Motif-монанди мудири тиреза
Comment[tr]=Windows 95-OS/2-Motif benzeri bir pencere yöneticisi
Comment[uk]=Менеджер вікон наподіб Windows 95-OS/2-Motif
Comment[uz]=Win95-OS/2-Motif'га ўхшаш ойна бошқарувчи
Comment[vi]=Trình quản lý cửa sổ với mô típ kiểu Windows 95
Comment[wa]=On manaedjeu di purneas rishonnant Windows95-OS/2-Motif
Comment[xx]=xxA Windows 95-OS/2-Motif-like window managerxx
Comment[zh_CN]=类似 Windows-OS/2-Motif 的窗口管理器
++++++ icewm-multiByte.patch ++++++
--- /var/tmp/diff_new_pack.D9kJ1t/_old 2010-03-07 10:57:27.000000000 +0100
+++ /var/tmp/diff_new_pack.D9kJ1t/_new 2010-03-07 10:57:27.000000000 +0100
@@ -6,7 +6,7 @@
"Falling back to 'C' locale'."));
fLocaleName = setlocale(LC_ALL, "C");
}
--/// TODO #warning "should always use multibyte/fontset if I18N"
+-#warning "P1 should always use multibyte/fontset if I18N"
- multiByte = (MB_CUR_MAX > 1);
+ multiByte = true;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org