Accepting request 28928 from X11:windowmanagers

Copy from X11:windowmanagers/fvwm2 based on submit request 28928 from user coolo

OBS-URL: https://build.opensuse.org/request/show/28928
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fvwm2?expand=0&rev=23

fvwm2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Dec 28 18:20:51 CET 2009 - vuntz@opensuse.org
+
+- Remove gnome-libs-devel, gtk-devel, gtkdoc, imlib-config,
+  imlib-devel BuildRequires.
+- Add xorg-x11-devel BuildRequires.
+- Pass --disable-gtk to configure.
+- Remove gtk subpackage: it's optional, and doesn't look that good.
+- This is for fate#308601: remove gtk/gnome 1.x stack.
+
 -------------------------------------------------------------------
 Tue Nov  3 19:09:16 UTC 2009 - coolo@novell.com
 

fvwm2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package fvwm2 (Version 2.5.26)
 #
-# 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,14 +19,14 @@
 
 
 Name:           fvwm2
-BuildRequires:  freetype2-devel fribidi-devel gcc-c++ gnome-libs-devel gtk-devel gtkdoc imlib-config imlib-devel libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files
+BuildRequires:  freetype2-devel fribidi-devel gcc-c++ libpng-devel libstroke-devel pkgconfig readline-devel update-desktop-files xorg-x11-devel
 License:        GPLv2+
 Group:          System/GUI/Other
 Provides:       fvwm fvwmicns windowmanager xpmroot
 Obsoletes:      fvwm xpmroot
 AutoReqProv:    on
 Version:        2.5.26
-Release:        41
+Release:        42
 Summary:        Improved Version of FVWM Window Manager
 Url:            http://www.fvwm.org
 Source0:        fvwm-%{version}.tar.bz2
@@ -53,25 +53,6 @@ compatible with the Motif MWM.
 
 
 
-Authors:
---------
-    The fvwm developers <fvwm-workers@fvwm.org>
-
-%package gtk
-License:        BSD3c
-Summary:        Improved Version of FVWM Window Manager
-Group:          System/GUI/Other
-Requires:       fvwm2
-
-%description gtk
-FVWM is a virtual desktop window manager for the X Window System.
-
-FVWM is intended to have a small memory footprint but a rich feature
-set, to be extremely customizable and extendible, and to be very
-compatible with the Motif MWM.
-
-
-
 Authors:
 --------
     The fvwm developers <fvwm-workers@fvwm.org>
@@ -119,7 +100,8 @@ LDFLAGS="-L/usr/%_lib" \
 		--mandir=%{_xorg7mandir} \
 		--x-includes=%{_xorg7prefix}/include \
 		--x-libraries=%{_xorg7prefix}/%_lib \
-		--with-imagepath=%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps:%{_prefix}/%{_xorg7libshare}/X11/fvwm2/bitmaps:/usr/share/wallpapers
+		--with-imagepath=%{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps:%{_prefix}/%{_xorg7libshare}/X11/fvwm2/bitmaps:/usr/share/wallpapers \
+		--disable-gtk
 make %{?jobs:-j%jobs}
 
 %install
@@ -175,7 +157,6 @@ rm -rf $RPM_BUILD_ROOT
 %config /etc/X11/fvwm2/system.fvwm2rc
 %{_prefix}/%{_xorg7bin}/*
 %{_prefix}/%{_xorg7libs32}/X11/fvwm2/*
-%exclude %{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk*
 %{_prefix}/%{_xorg7libshare}/X11/fvwm2/pixmaps/*
 #%{_xorg7prefix}/share/locale/*/*/*
 # the find_lang macro is not very usable for fwvm, 
@@ -214,8 +195,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_xorg7prefix}/share/locale/zh_CN/LC_MESSAGES
 %endif
 
-%files gtk
-%defattr(-,root,root)
-%{_prefix}/%{_xorg7libs32}/X11/fvwm2/FvwmGtk*
-
 %changelog