SPECS: metacity.spec - 2.22.0 - merged from DEVEL

[patrys]

Author: patrys                       Date: Tue Mar 11 23:29:53 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   metacity.spec (1.133 -> 1.134) 

---- Diffs:

================================================================
Index: SPECS/metacity.spec
diff -u SPECS/metacity.spec:1.133 SPECS/metacity.spec:1.134
--- SPECS/metacity.spec:1.133	Wed Jan  9 20:30:34 2008
+++ SPECS/metacity.spec	Wed Mar 12 00:29:48 2008
@@ -14,30 +14,26 @@
 Summary:	Metacity window manager
 Summary(pl.UTF-8):	Zarządca okien Metacity
 Name:		metacity
-Version:	2.20.2
+Version:	2.22.0
 Release:	1
 Epoch:		2
 License:	GPL v2+
 Group:		X11/Window Managers
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/metacity/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	3b986030629860674b219fc35c226b1b
-Patch0:		%{name}-libtool.patch
-Patch1:		%{name}-swap-resize-button.patch
-Patch2:		http://www.student.dtu.dk/~s021749/metacitydebs/2.16.3_i386/021-twinview-modification.patch
-BuildRequires:	GConf2-devel >= 2.19.1
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/metacity/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	8cb6d02cf66a1003532b4f5d2754d696
+Patch0:		%{name}-swap-resize-button.patch
+Patch1:		http://www.student.dtu.dk/~s021749/metacitydebs/2.16.3_i386/021-twinview-modification.patch
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	fontconfig-devel
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	intltool >= 0.36.2
-BuildRequires:	libcm-devel >= 0.1.1
-BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	gtk+2-devel >= 2:2.12.8
+BuildRequires:	intltool >= 0.37.0
 BuildRequires:	libtool
-BuildRequires:	pango-devel >= 1:1.18.1
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	xorg-lib-libSM-devel
 Requires(post,preun):	GConf2
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	metacity-theme-base = %{epoch}:%{version}-%{release}
@@ -72,7 +68,7 @@
 Summary(pl.UTF-8):	Metacity - pliki nagłówkowe
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	libcm-devel
+Requires:	gtk+2-devel >= 2:2.12.8
 
 %description devel
 This package contains header files for Metacity window manager.
@@ -185,10 +181,9 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+#%%patch0
 %if %{with xinerama_fix}
-%patch2 -p1
+%patch1 -p1
 %endif
 
 sed -i -e s#sr\@Latn#sr\@latin# po/LINGUAS
@@ -199,6 +194,7 @@
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-schemas-install \
@@ -276,6 +272,7 @@
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmetacity-private.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmetacity-private.so.0
 
 %files devel
 %defattr(644,root,root,755)
@@ -295,9 +292,27 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.134  2008-03-11 23:29:48  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.132.2.4  2008-03-11 22:59:18  patrys
+- 2.22.0
+
+Revision 1.132.2.3  2008-02-14 12:31:48  megabajt
+- updated to 2.21.13
+
+Revision 1.132.2.2  2008-02-06 13:09:42  patrys
+- 2.21.8
+- drop patch0 (no longer needed)
+- patch1 inactive (not sure what it did but looks like it changed the behavior)
+
 Revision 1.133  2008-01-09 19:30:34  megabajt
 - updated to 2.20.2
 
+Revision 1.132.2.1  2007-12-19 14:51:33  patrys
+- 2.21.5
+
 Revision 1.132  2007-11-19 06:54:13  megabajt
 - updated to 2.20.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/metacity.spec?r1=1.133&r2=1.134&f=u