SPECS (AC-branch): xfwm4.spec - updated to 4.4.0, merged from HEAD

megabajt megabajt at pld-linux.org
Mon Jan 29 10:10:33 CET 2007


Author: megabajt                     Date: Mon Jan 29 09:10:33 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 4.4.0, merged from HEAD

---- Files affected:
SPECS:
   xfwm4.spec (1.43.2.1 -> 1.43.2.2) 

---- Diffs:

================================================================
Index: SPECS/xfwm4.spec
diff -u SPECS/xfwm4.spec:1.43.2.1 SPECS/xfwm4.spec:1.43.2.2
--- SPECS/xfwm4.spec:1.43.2.1	Wed Jul  5 17:12:40 2006
+++ SPECS/xfwm4.spec	Mon Jan 29 10:10:28 2007
@@ -1,42 +1,38 @@
 # $Revision$, $Date$
-%bcond_without	compositor		# without compositor extensions
-#
-%define		_xfce_ver	4.2.3
 Summary:	Next generation window manager for Xfce
 Summary(pl):	Zarządca okien nowej generacji dla Xfce
 Name:		xfwm4
-Version:	4.2.3.2
+Version:	4.4.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5:	d73e89c50179ccb438c076b3b71d59a4
+Source0:	http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
+# Source0-md5:	8bb7231a20b30bfc1936b0facb9f072c
 Patch0:		%{name}-locale-names.patch
 URL:		http://www.xfce.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2.2.0
-BuildRequires:	intltool
+BuildRequires:	gtk+2-devel >= 2:2.8.20
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libtool
-BuildRequires:	libxfce4mcs-devel >= %{_xfce_ver}
-BuildRequires:	libxfcegui4-devel >= %{_xfce_ver}
+BuildRequires:	libxfce4mcs-devel >= %{version}
+BuildRequires:	libxfcegui4-devel >= %{version}
 BuildRequires:	pkgconfig >= 1:0.9.0
-BuildRequires:	startup-notification-devel >= 0.5
-BuildRequires:	xfce-mcs-manager-devel >= %{_xfce_ver}
-BuildRequires:	xfce4-dev-tools
-Requires:	libxfce4mcs >= %{_xfce_ver}
-Requires:	libxfcegui4 >= %{_xfce_ver}
-Requires:	xfce-mcs-manager >= %{_xfce_ver}
+BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	startup-notification-devel >= 0.8
+BuildRequires:	xfce-mcs-manager-devel >= %{version}
+BuildRequires:	xfce4-dev-tools >= %{version}
+Requires(post,postun):	gtk+2
+Requires(post,postun):	hicolor-icon-theme
+Requires:	xfce-mcs-manager >= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3
-and Xfce.
+xfwm4 is a EWMH standard compliant window manager.
 
 %description -l pl
-xfwm4 to zarządca okien kompatybilny z GNOME, GNOME2, KDE2, KDE3 oraz
-Xfce.
+xfwm4 to zarządca okien zgodny ze standardem EWMH.
 
 %prep
 %setup -q
@@ -46,15 +42,14 @@
 mv -f po/{nb_NO,nb}.po
 
 %build
-%{__intltoolize}
 %{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
-%{__aclocal} -I %{_datadir}/xfce4/dev-tools/m4macros
+%{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
-%configure %{?with_compositor:--enable-compositor}
-
+%configure
 %{__make}
 
 %install
@@ -72,6 +67,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO example.gtkrc-2.0
@@ -89,7 +90,7 @@
 # undermentioned dirs belong to xfce-mcs-manager
 %{_datadir}/xfce4/doc/C/*
 %lang(fr) %{_datadir}/xfce4/doc/fr/*
-%lang(he) %{_datadir}/xfce4/doc/he/*
+%lang(it) %{_datadir}/xfce4/doc/it/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -97,6 +98,42 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43.2.2  2007/01/29 09:10:28  megabajt
+- updated to 4.4.0, merged from HEAD
+
+Revision 1.48  2007/01/22 18:02:34  megabajt
+- updated to 4.4.0
+
+Revision 1.47  2006/11/06 21:39:10  megabajt
+- up to 4.3.99.2 (Xfce 4.4RC2)
+- updated deps
+
+Revision 1.46  2006/09/04 16:23:28  megabajt
+- up to 4.3.99.1
+- use rpm macros
+
+Revision 1.45  2006/07/16 18:48:54  freetz
+- merged from DEVEL, update icon cache
+
+Revision 1.44.2.5  2006/07/16 18:47:17  freetz
+- 4.3.90.2, updated deps, --as-needed support, removed obsolete configure_ac
+  patch, removed compositor bcond (can be disabled at runtime)
+
+Revision 1.44.2.4  2006/07/01 14:47:10  lmasko
+- added patch xfwm4-configure_ac.patch to correct configure.ac syntax
+
+Revision 1.44.2.3  2006/05/17 06:18:21  charles
+- cosmetics
+
+Revision 1.44.2.2  2006/05/17 05:27:53  charles
+- default is --enable-compositor
+
+Revision 1.44.2.1  2006/04/26 19:29:52  troll
+- updated to 4.3.90.1
+
+Revision 1.44  2006/03/17 16:36:55  megabajt
+- modular xorg deps
+
 Revision 1.43.2.1  2006/07/05 15:12:40  havner
 - intltoolize before glib-gettextize
 - removed TODO, /usr/share/themes/Default is owned by X11-libs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xfwm4.spec?r1=1.43.2.1&r2=1.43.2.2&f=u



More information about the pld-cvs-commit mailing list