From f4b3a2b940a63150506c3a876f603798c25e6c4c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Jul 26 2010 05:17:24 +0000 Subject: Initial version for epel5 --- diff --git a/sources b/sources index fc99c6e..dcf0bba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c531edad76c909001acccc02936404f2 xfwm4-4.4.1.tar.bz2 +3e6c0c54b028b6ea60e865e55ecdf3f8 xfwm4-4.6.2.tar.bz2 diff --git a/xfwm4-4.6.1-dsofix.patch b/xfwm4-4.6.1-dsofix.patch new file mode 100644 index 0000000..0174ef5 --- /dev/null +++ b/xfwm4-4.6.1-dsofix.patch @@ -0,0 +1,12 @@ +diff -Nur xfwm4-4.6.1.orig/src/Makefile.in xfwm4-4.6.1/src/Makefile.in +--- xfwm4-4.6.1.orig/src/Makefile.in 2009-04-15 01:59:55.000000000 -0600 ++++ xfwm4-4.6.1/src/Makefile.in 2010-02-13 14:29:19.000000000 -0700 +@@ -107,7 +107,7 @@ + CCDEPMODE = @CCDEPMODE@ + CFLAGS = @CFLAGS@ + COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@ +-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@ ++COMPOSITOR_LIBS = @COMPOSITOR_LIBS@ -lm + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ diff --git a/xfwm4-4.6.1-nodoka.patch b/xfwm4-4.6.1-nodoka.patch new file mode 100644 index 0000000..69649c7 --- /dev/null +++ b/xfwm4-4.6.1-nodoka.patch @@ -0,0 +1,11 @@ +--- xfwm4-4.6.1/defaults/defaults.orig 2009-09-20 06:20:59.000000000 +0200 ++++ xfwm4-4.6.1/defaults/defaults 2009-09-20 06:21:43.000000000 +0200 +@@ -46,7 +46,7 @@ + snap_to_border=true + snap_to_windows=false + snap_width=10 +-theme=Default ++theme=Nodoka + title_alignment=center + title_font=Sans Bold 9 + title_horizontal_offset=0 diff --git a/xfwm4.spec b/xfwm4.spec index 5e019ee..853a1f4 100644 --- a/xfwm4.spec +++ b/xfwm4.spec @@ -1,79 +1,156 @@ Summary: Next generation window manager for Xfce Name: xfwm4 -Version: 4.4.1 -Release: 2%{?dist} +Version: 4.6.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.4.1/src/xfwm4-4.4.1.tar.bz2 -Patch0: xfwm4-4.4.1-fix-typo.patch +Source0: http://archive.xfce.org/src/xfce/xfwm4/4.6/xfwm4-%{version}.tar.bz2 +Patch0: xfwm4-4.6.1-nodoka.patch +# Upstream bug: http://bugzilla.xfce.org/show_bug.cgi?id=6231 +Patch3: xfwm4-4.6.1-dsofix.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libxfce4mcs >= %{version} Requires: libxfcegui4 >= %{version} -Requires: xfce-mcs-manager >= %{version} -BuildRequires: libxfce4mcs-devel >= %{version} +Requires: xfce4-doc BuildRequires: libxfcegui4-devel >= %{version} -BuildRequires: xfce-mcs-manager-devel >= %{version} -BuildRequires: imake -BuildRequires: libXt-devel -BuildRequires: libXpm-devel BuildRequires: libXext-devel BuildRequires: gettext intltool BuildRequires: libXcomposite-devel BuildRequires: libXdamage-devel BuildRequires: startup-notification-devel +BuildRequires: libglade2-devel +BuildRequires: libwnck-devel +BuildRequires: xfconf-devel +BuildRequires: desktop-file-utils %description xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce. %prep %setup -q -%patch0 -p1 -b .fix-typo +# use Nodoka Theme +%patch0 -p1 -b .nodoka +%patch3 -p1 -b .dsofix %build -%configure +%configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - -rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la +make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' %find_lang %{name} +for file in $RPM_BUILD_ROOT/%{_datadir}/applications/*.desktop; do + desktop-file-install \ + --vendor='' \ + --dir ${RPM_BUILD_ROOT}%{_datadir}/applications/ \ + --delete-original \ + $file +done + %clean rm -rf $RPM_BUILD_ROOT %post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor +if [ -x %{_bindir}/gtk-update-icon-cache ] ; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -f %{name}.lang %defattr(-,root,root,-) %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR %{_bindir}/xfwm4 -%{_libdir}/xfce4/mcs-plugins/* +%{_bindir}/xfwm4-settings +%{_bindir}/xfwm4-tweaks-settings +%{_bindir}/xfwm4-workspace-settings %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/*/* -%dir %{_datadir}/xfce4 -%{_datadir}/xfce4/doc/*/images/* -%{_datadir}/xfce4/doc/*/*.html +%doc %{_datadir}/xfce4/doc/*/images/* +%doc %{_datadir}/xfce4/doc/*/*.html %{_datadir}/xfwm4 -%{_datadir}/themes +%{_datadir}/themes/* +%{_libexecdir}/xfce4/xfwm4 %changelog -* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-2 +* Fri May 21 2010 Kevin Fenzi - 4.6.2-1 +- Update to 4.6.2 + +* Sat Feb 13 2010 Kevin Fenzi - 4.6.1-7 +- Add patch to fix DSO linking issue. Fixes bug #564730 + +* Sun Dec 13 2009 Kevin Fenzi - 4.6.1-6 +- Add patch for multi monitor issue (xfce bug #5795) + +* Sun Sep 20 2009 Christoph Wickert - 4.6.1-5 +- Validate *.desktop files + +* Sun Sep 20 2009 Christoph Wickert - 4.6.1-4 +- Make Nodoka default (fixes bug #491092) + +* Tue Jul 28 2009 Kevin Fenzi - 4.6.1-3 +- Add patch for focus issue (fixes bug #514206) + +* Mon Jul 27 2009 Fedora Release Engineering - 4.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Apr 19 2009 Kevin Fenzi - 4.6.1-1 +- Update to 4.6.1 + +* Sat Feb 28 2009 Christoph Wickert - 4.6.0-2 +- Fix directory ownership problems +- Require xfce4-doc + +* Thu Feb 26 2009 Kevin Fenzi - 4.6.0-1 +- Update to 4.6.0 +- Remove unneeded BuildRequires + +* Thu Feb 26 2009 Fedora Release Engineering - 4.5.99.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jan 26 2009 Kevin Fenzi - 4.5.99.1-1 +- Update to 4.5.99.1 + +* Tue Jan 13 2009 Kevin Fenzi - 4.5.93-1 +- Update to 4.5.93 + +* Sat Dec 27 2008 Kevin Fenzi - 4.5.92-1 +- Update to 4.5.92 + +* Mon Oct 27 2008 Christoph Wickert - 4.4.3-1 +- Update to 4.4.3 +- Update gtk-update-icon-cache scriptlets + +* Sun Jul 20 2008 Christoph Wickert - 4.4.2-4 +- Really switch to Nodoka theme + +* Wed Apr 23 2008 Christoph Wickert - 4.4.2-3 +- Switch to Nodoka theme by default +- disable-static instead of removing *.a files + +* Sun Feb 10 2008 Kevin Fenzi - 4.4.2-2 +- Rebuild for gcc43 + +* Sun Nov 18 2007 Kevin Fenzi - 4.4.2-1 +- Update to 4.4.2 + +* Mon Aug 27 2007 Kevin Fenzi - 4.4.1-3 - Update License tag +* Mon Jul 9 2007 Kevin Fenzi - 4.4.1-2 +- Add patch for gtk2 hang issue (fixes #243735) + * Wed Apr 11 2007 Kevin Fenzi - 4.4.1-1 - Update to 4.4.1