- merged from DEVEL

Changed files:
    xfwm4.spec -> 1.26

diff --git a/xfwm4.spec b/xfwm4.spec
index cc701275332709cb8326f663263b1aca850f05dd..7f7b61b8566e6777d717fc18f6c6744398c285f8 100644 (file)
--- a/xfwm4.spec
+++ b/xfwm4.spec
@@ -1,17 +1,18 @@
 Summary:       Next generation window manager for XFce
 Summary(pl):   Zarz±dca okien nowej generacji dla XFce
 Name:          xfwm4
-Version:       4.0.6
+Version:       4.1.99.1
 Release:       1
 License:       GPL
 Group:         X11/Applications
 #Source0:      ftp://ftp.berlios.de/pub/xfce-goodies/%{version}/%{name}-%{version}.tar.gz
 Source0:       http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-%{version}/src/%{name}-%{version}.tar.gz
-# Source0-md5: 911688ba221bc65e66e15bb87993edec
+# Source0-md5: 961f5f18d437d78e47cd9f9c8b567bd4
 Patch0:                %{name}-locale-names.patch
 URL:           http://www.xfce.org/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
+BuildRequires: gtk+2-devel >= 2.2.0
 BuildRequires: intltool
 BuildRequires: libtool
 BuildRequires: libxfce4mcs-devel >= %{version}
@@ -20,9 +21,8 @@ BuildRequires:        pkgconfig >= 1:0.9.0
 BuildRequires: startup-notification-devel >= 0.5
 BuildRequires: xfce-mcs-manager-devel >= %{version}
 Requires:      libxfce4mcs >= %{version}
-Requires:      libxfcegui4 >= %{version}
-Requires:      startup-notification >= 0.5
-Requires:      xfce-mcs-manager >= %{version}
+Requires:      libxfcegui4 >= 4.1.21
+Requires:      xfce-mcs-manager >= 4.1.90
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,8 +37,6 @@ XFce.
 %setup -q
 %patch0 -p1
 
-mv -f po/{fa_IR,fa}.po
-mv -f po/{no,nb}.po
 mv -f po/{pt_PT,pt}.po
 
 %build
@@ -46,9 +44,9 @@ glib-gettextize --copy --force
 intltoolize --copy --force
 %{__libtoolize}
 %{__aclocal} -I m4
-%{__autoconf}
 %{__autoheader}
 %{__automake}
+%{__autoconf}
 %configure
 
 %{__make}
@@ -56,6 +54,8 @@ intltoolize --copy --force
 %install
 rm -rf $RPM_BUILD_ROOT
 
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/themes
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -68,14 +68,21 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO example.xfwm4rc example.gtkrc-2.0
+%doc AUTHORS ChangeLog README TODO example.gtkrc-2.0
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/xfce4/mcs-plugins/*.so
+
+%{_desktopdir}/*.desktop
+
 %dir %{_datadir}/xfwm4
 %{_datadir}/xfwm4/defaults
-%{_datadir}/xfwm4/themes
+%{_datadir}/themes/*
+%{_iconsdir}/hicolor/*/*/*
+
 %docdir %{_datadir}/xfce4/doc
 %{_datadir}/xfce4/doc/C/*.html
-%{_datadir}/xfce4/doc/C/images/*
+%{_datadir}/xfce4/doc/C/images/*.png
 %lang(fr) %{_datadir}/xfce4/doc/fr/*.html
-%lang(fr) %{_datadir}/xfce4/doc/fr/images/*
+%lang(fr) %{_datadir}/xfce4/doc/fr/images/*.png
+%lang(it) %{_datadir}/xfce4/doc/it/*.html
+%lang(it) %{_datadir}/xfce4/doc/it/images/*.png