Author: megabajt Date: Sat Sep 27 12:23:22 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.24.0; merged from DEVEL
---- Files affected: SPECS: metacity.spec (1.134 -> 1.135) ---- Diffs: ================================================================ Index: SPECS/metacity.spec diff -u SPECS/metacity.spec:1.134 SPECS/metacity.spec:1.135 --- SPECS/metacity.spec:1.134 Wed Mar 12 00:29:48 2008 +++ SPECS/metacity.spec Sat Sep 27 14:23:17 2008 @@ -7,27 +7,21 @@ # instead of linking with built one?) # -%bcond_with xinerama_fix # build with better (imho) window placing in - # while using xinerama, see - # http://ubuntuforums.org/showthread.php?t=242502 - Summary: Metacity window manager Summary(pl.UTF-8): Zarządca okien Metacity Name: metacity -Version: 2.22.0 +Version: 2.24.0 Release: 1 Epoch: 2 License: GPL v2+ Group: X11/Window Managers -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 +Source0: http://ftp.gnome.org/pub/GNOME/sources/metacity/2.24/%{name}-%{version}.tar.bz2 +# Source0-md5: d4aa782d5f71b6c42514b239684a4aa3 +BuildRequires: GConf2-devel >= 2.24.0 BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: gettext-devel -BuildRequires: gtk+2-devel >= 2:2.12.8 +BuildRequires: gtk+2-devel >= 2:2.14.0 BuildRequires: intltool >= 0.37.0 BuildRequires: libtool BuildRequires: pkgconfig @@ -39,11 +33,10 @@ Requires: metacity-theme-base = %{epoch}:%{version}-%{release} Provides: gnome-wm # [EMAIL PROTECTED] vs. [EMAIL PROTECTED] +Conflicts: filesystem < 3.0-20 Conflicts: glibc-misc < 6:2.7 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _wmpropsdir /usr/share/wm-properties - %description Metacity is a simple window manager that integrates nicely with GNOME2. @@ -68,7 +61,7 @@ Summary(pl.UTF-8): Metacity - pliki nagłówkowe Group: X11/Development/Libraries Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: gtk+2-devel >= 2:2.12.8 +Requires: gtk+2-devel >= 2:2.14.0 %description devel This package contains header files for Metacity window manager. @@ -181,13 +174,6 @@ %prep %setup -q -#%%patch0 -%if %{with xinerama_fix} -%patch1 -p1 -%endif - -sed -i -e [EMAIL PROTECTED]@latin# po/LINGUAS -mv -f po/[EMAIL PROTECTED],latin}.po %build %{__intltoolize} @@ -207,7 +193,6 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - desktopfilesdir=%{_wmpropsdir} \ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install doc/metacity-theme.dtd $RPM_BUILD_ROOT%{_datadir}/xml/metacity @@ -235,9 +220,10 @@ %attr(755,root,root) %{_bindir}/metacity-window-demo %attr(755,root,root) %{_libdir}/metacity-dialog %{_datadir}/%{name} -%{_wmpropsdir}/metacity.desktop +%{_desktopdir}/metacity.desktop %{_sysconfdir}/gconf/schemas/metacity.schemas %{_datadir}/gnome-control-center/keybindings/*.xml +%{_datadir}/gnome/wm-properties/metacity-wm.desktop %{_datadir}/xml/metacity %{_mandir}/man1/metacity*.1* @@ -292,7 +278,51 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.134 2008/03/11 23:29:48 patrys +Revision 1.135 2008/09/27 12:23:17 megabajt +- updated to 2.24.0; merged from DEVEL + +Revision 1.134.2.13 2008/09/18 15:37:57 patrys +- add wm desktop + +Revision 1.134.2.12 2008/09/13 09:42:07 patrys +- drop bcond (upstream behavior changed) +- drop patch0 (swap buttons, was disabled anyway) +- if you want to change wm's behavior, do it upstream + +Revision 1.134.2.11 2008/09/10 12:43:01 patrys +- 2.23.610 + +Revision 1.134.2.10 2008/09/04 08:30:01 patrys +- 2.23.377 + +Revision 1.134.2.9 2008/08/18 14:27:55 patrys +- 2.23.144 + +Revision 1.134.2.8 2008/08/05 19:25:53 patrys +- drop desktop workaround (now properly handled by gnome-session) + +Revision 1.134.2.7 2008/07/24 08:10:06 patrys +- 2.23.55 + +Revision 1.134.2.6 2008/06/18 11:59:28 patrys +- 2.23.34 + +Revision 1.134.2.5 2008-06-08 13:10:22 patrys +- move desktop file to gnome autostart + +Revision 1.134.2.4 2008-05-27 13:57:12 patrys +- 2.23.21 + +Revision 1.134.2.3 2008-05-13 18:14:22 patrys +- add missing symlink + +Revision 1.134.2.2 2008-05-13 16:48:37 patrys +- package desktop file for session + +Revision 1.134.2.1 2008-05-13 13:27:17 patrys +- 2.23.13 + +Revision 1.134 2008-03-11 23:29:48 patrys - 2.22.0 - merged from DEVEL ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/metacity.spec?r1=1.134&r2=1.135&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
