rpms/icewm/devel icewm-configure.patch, 1.2, 1.3 icewm.spec, 1.22, 1.23

[Gilboa Davara]

Author: gilboa

Update of /cvs/pkgs/rpms/icewm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20577

Modified Files:
	icewm-configure.patch icewm.spec 
Log Message:


icewm-configure.patch:
 configure.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: icewm-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm-configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- icewm-configure.patch	6 Jan 2009 12:06:16 -0000	1.2
+++ icewm-configure.patch	24 Sep 2009 21:51:01 -0000	1.3
@@ -15,27 +15,6 @@
  	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
  	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
 -	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
-+	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/
-       fi
- 
-       if test "${GNOME2_CFLAGS}" = ""; then
---- icewm-1.2.30/configure.old	2007-01-16 17:44:10.000000000 +0200
-+++ icewm-1.2.30/configure	2007-01-16 17:44:31.000000000 +0200
-@@ -12564,7 +12564,8 @@
-       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`
- 
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -12575,7 +12576,7 @@
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome2"
- 	GNOME2_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
- 	GWMDIR="${GNOME2_PREFIX}/share/gnome/wm-properties/"
--	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/gnome/vfolders/"
 +	CONFIG_GNOME2_MENU_DIR="${GNOME2_PREFIX}/share/desktop-directories/"
        fi
  


Index: icewm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/icewm/devel/icewm.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- icewm.spec	25 Jul 2009 03:07:32 -0000	1.22
+++ icewm.spec	24 Sep 2009 21:51:01 -0000	1.23
@@ -29,6 +29,7 @@ BuildRequires:	libXft-devel
 BuildRequires:	libICE-devel
 BuildRequires:	gettext
 BuildRequires:	gnome-desktop-devel
+BuildRequires:	fribidi-devel
 %if 0%{?fedora} > 10
 BuildRequires:	libgnomeui-devel
 BuildRequires:	gnome-vfs2-devel
@@ -46,6 +47,7 @@ Patch0:			icewm-configure.patch
 Patch1:			icewm-menu.patch
 Patch2:			icewm-toolbar.patch
 Patch3:			icewm-keys.patch
+Patch4:			icewm-fribidi.patch
 
 
 %description
@@ -95,13 +97,16 @@ older Fedora releases and RHEL.
 %patch1 -p1 -b .menu
 %patch2 -p1 -b .toolbar
 %patch3 -p1 -b .keys
+%patch4 -p0 -b .fribidi
 
 
 %build
 # Configure sets the CXXFLAGS to: -fpermissive -fno-exceptions -fno-rtti -Wxxx...
 # In general it doesn't seem to break anything. BZ# if you hit something bad.
+./autogen.sh
 %configure --enable-gradients 					\
 			--enable-antialiasing				\
+			--enable-i18n						\
 			--enable-menus-gnome2				\
 			--disable-menus-gnome1				\
 			--with-cfgdir=%{_sysconfdir}/icewm
@@ -201,12 +206,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.37-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Wed Sep 24 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-2
+- Patch in missing fribidi support. (BZ #515134)
 
 * Wed Jul 15 2009 Gilboa Davara <gilboad[AT]gmail.com> - 1.2.37-1
 - 1.2.37.
-- Fix missing directory ownership. (#483346)
+- Fix missing directory ownership. (#511639)
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.36-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild