Hello community, here is the log from the commit of package metacity checked in at Tue Jan 9 17:52:35 CET 2007. -------- --- GNOME/metacity/metacity.changes 2006-10-15 23:50:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/metacity/metacity.changes 2006-12-18 14:33:39.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 18 14:11:54 CET 2006 - sbrabec@suse.cz + +- Prefix changed to /usr. +- Spec file cleanup. +- Splitted devel subpackage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.E16566/_old 2007-01-09 17:52:27.000000000 +0100 +++ /var/tmp/diff_new_pack.E16566/_new 2007-01-09 17:52:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package metacity (Version 2.16.3) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,22 +12,24 @@ Name: metacity BuildRequires: gconf2-devel gnome-patch-translation gtk2-devel intltool libglade2-devel perl-XML-Parser startup-notification-devel update-desktop-files -%define prefix /opt/gnome -%define sysconfdir /etc%{prefix} -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/GUI/GNOME -Autoreqprov: on Version: 2.16.3 -Release: 6 +Release: 29 Summary: A Fast Window Manager for the GNOME 2.x Desktop -Source: metacity-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Patch: metacity-ping-timeout.patch Patch2: metacity-preconf.dif Patch8: metacity-audible-bell-off.patch Patch9: metacity-windows-key-binding.patch URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: filesystem gconf2 +# Only for /usr/share/gnome directory ownership: +BuildRequires: libgnome +Requires: libgnome +Autoreqprov: on + +%gconf_schemas_prereq %description Metacity is a fast window manager for the GNOME 2.x Desktop. It can be @@ -36,18 +38,28 @@ +%package devel +Summary: Include Files and Libraries mandatory for Development. +Group: System/GUI/GNOME +Requires: %{name} = %{version} gtk2-devel + +%description devel +This package contains all necessary include files and libraries needed +to develop applications that require these. + + + %prep -%setup -n metacity-%{version} -#gnome-patch-translation-prepare +%setup -q +gnome-patch-translation-prepare %patch -p1 %patch2 -p1 %patch8 %patch9 -#gnome-patch-translation-update +gnome-patch-translation-update %build -intltoolize --force -autoreconf -fi +autoreconf -f -i ## HACK ALERT BEGIN # work around 9.2 deficiency if test -f /usr/X11R6/%_lib/libXfixes.a -a ! -f /usr/X11R6/%_lib/libXfixes.so ; then @@ -55,51 +67,60 @@ export LDFLAGS="-L." fi ## HACK ALERT END -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - ./configure \ - --prefix=%prefix \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --mandir=%prefix/share/man \ - --localstatedir=/var/%_lib \ - --libexecdir=%{prefix}/lib/metacity \ - --libdir=%prefix/%_lib \ - --disable-schemas-install \ +# needed for metacity-2.16.3: +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +# FIXME: Check, whether --disable-compositor is still needed. +%configure\ + --libexecdir=%{_prefix}/lib/%{name}\ + --disable-schemas-install\ --disable-compositor -make +make %{?jobs:-j%jobs} %install make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{prefix}/%{_lib}/*.*a +%find_lang %{name} +%find_gconf_schemas +cat %{name}.lang %{name}.schemas_list >%{name}.lst + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre -f %{name}.schemas_pre %post %run_ldconfig -export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` -opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/metacity.schemas >/dev/null + +%posttrans -f %{name}.schemas_posttrans + +%preun -f %{name}.schemas_preun %postun %run_ldconfig -%clean -rm -rf $RPM_BUILD_ROOT - -%files +%files -f %{name}.lst %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -%{prefix}/bin/* -%{prefix}/share/locale/*/LC_MESSAGES/*.mo -/etc/%{prefix}/gconf/schemas/metacity.schemas -%{prefix}/%_lib/*.so -%{prefix}/%_lib/*.so.* -%{prefix}/lib/metacity -%{prefix}/share/man/man*/* -/opt/gnome/share/gnome/wm-properties/*.desktop -%{prefix}/share/metacity -%{prefix}/share/themes/* -%{prefix}/include/metacity-1 -%{prefix}/%_lib/pkgconfig/*.pc +%{_bindir}/* +%{_libdir}/*.so.* +%dir %{_datadir}/gnome/wm-properties +%{_datadir}/gnome/wm-properties/*.desktop +%{_datadir}/metacity +%{_datadir}/themes/* +%doc %{_mandir}/man*/* +%{_prefix}/lib/metacity + +%files devel +%defattr (-, root, root) +%{_includedir}/metacity-1 +%{_libdir}/*.so +%{_libdir}/*.*a +%{_libdir}/pkgconfig/*.pc %changelog -n metacity +* Mon Dec 18 2006 - sbrabec@suse.cz +- Prefix changed to /usr. +- Spec file cleanup. +- Splitted devel subpackage. * Sun Oct 15 2006 - danw@suse.de - Remove dead patches - Remove pre-compiz patches for using metacity with xcompmgr under xgl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org