OBS User unknown 2009-02-23 11:52:23 +00:00 committed by Git OBS Bridge
parent 1d584e6ae6
commit ab8af4f897
4 changed files with 38 additions and 10 deletions

View File

@ -0,0 +1,15 @@
Index: icewm-1.2.36/configure.in
===================================================================
--- icewm-1.2.36.orig/configure.in
+++ icewm-1.2.36/configure.in
@@ -820,8 +820,8 @@ AC_ARG_ENABLE(menus-gnome2,
if test "${PKG_CONFIG}" != ""; then
GNOME_VER=2
- GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0`
- GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0`
+ GNOME2_CFLAGS=`pkg-config --cflags gnome-desktop-2.0 libgnomeui-2.0`
+ GNOME2_LIBS=`pkg-config --libs gnome-desktop-2.0 libgnomeui-2.0`
AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])

View File

@ -1,7 +1,7 @@
#
# spec file for package icewm-lite (Version 1.2.36)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 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
@ -27,7 +27,7 @@ Requires: icewm
Conflicts: icewm-default
AutoReqProv: on
Version: 1.2.36
Release: 1
Release: 2
Source: icewm-%{version}.tar.bz2
Patch0: icewm-LANG.menu.patch
Patch1: icewm-multiByte.patch
@ -105,7 +105,7 @@ rm -rf $RPM_BUILD_ROOT;
/usr/bin/icewm-session
%changelog
* Sat Oct 25 2008 mmarek@suse.de
* Fri Oct 24 2008 mmarek@suse.de
- updated to 1.2.36 final
* add option TaskBarFullscreenAutoShow (default = 1)
* fixes --with-line build
@ -242,7 +242,7 @@ rm -rf $RPM_BUILD_ROOT;
default fonts when using Xft because the latest fontconfig
now actually uses the foundry and inserting an dummy value
doesn't work anymore.
* Sat Apr 26 2003 lmfabian@suse.de
* Fri Apr 25 2003 lmfabian@suse.de
- update to 1.2.7
- add "fontconfig fontconfig-devel" to neededforbuild
- icewm-always-use-xft.patch: if we have Xft2, don't disable Xft

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 23 00:16:09 CET 2009 - vuntz@novell.com
- Add icewm-1.2.36-gnome-compilation.patch to fix build. The patch
should probably be sent upstream.
- Add libgnomeui-devel BuildRequires for the patch.
-------------------------------------------------------------------
Fri Oct 24 23:29:21 CEST 2008 - mmarek@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package icewm (Version 1.2.36)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 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,7 +19,7 @@
Name: icewm
BuildRequires: gcc-c++ giflib-devel gnome-desktop-devel imlib-devel libtiff-devel update-desktop-files
BuildRequires: gcc-c++ giflib-devel gnome-desktop-devel imlib-devel libgnomeui-devel libtiff-devel update-desktop-files
%if 0%{?suse_version} >= 1030
BuildRequires: fdupes
%endif
@ -29,7 +29,7 @@ Provides: windowmanager
Requires: icewm-bin, xdg-menu, desktop-data
AutoReqProv: on
Version: 1.2.36
Release: 1
Release: 2
Source: icewm-%{version}.tar.bz2
Source1: %{name}.desktop
Patch0: icewm-LANG.menu.patch
@ -41,6 +41,7 @@ Patch5: icewm-1.2.35-override-config.patch
Patch7: icewm-1.2.35-dialog-center-fix.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
# applied in %%build
Patch99: icewm-preferences.patch
Url: http://www.icewm.org/
@ -112,6 +113,7 @@ Authors:
%patch7
%patch8
%patch9
%patch10 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}
@ -181,7 +183,11 @@ rm -rf $RPM_BUILD_ROOT;
/usr/bin/icewm-menu-gnome2
%changelog
* Sat Oct 25 2008 mmarek@suse.de
* Mon Feb 23 2009 vuntz@novell.com
- Add icewm-1.2.36-gnome-compilation.patch to fix build. The patch
should probably be sent upstream.
- Add libgnomeui-devel BuildRequires for the patch.
* Fri Oct 24 2008 mmarek@suse.de
- updated to 1.2.36 final
* add option TaskBarFullscreenAutoShow (default = 1)
* fixes --with-line build
@ -329,7 +335,7 @@ rm -rf $RPM_BUILD_ROOT;
default fonts when using Xft because the latest fontconfig
now actually uses the foundry and inserting an dummy value
doesn't work anymore.
* Sat Apr 26 2003 lmfabian@suse.de
* Fri Apr 25 2003 lmfabian@suse.de
- update to 1.2.7
- add "fontconfig fontconfig-devel" to neededforbuild
- icewm-always-use-xft.patch: if we have Xft2, don't disable Xft
@ -412,7 +418,7 @@ rm -rf $RPM_BUILD_ROOT;
- added patch to load translated menus from files with a locale
suffix, e.g. menu.ko, menu.ja ...
- added Korean translations for menus
* Wed Nov 29 2000 grimmer@suse.de
* Tue Nov 28 2000 grimmer@suse.de
- removed icewm-themes-0.9.42.tar.gz from package
- moved system-wide configuration files to /etc/X11/icewm
for better FHS compliance