rpms/xfce4-session/F-11 xfce4-session-4.6.1-correct-shadows.patch, NONE, 1.1 xfce4-session-4.6.1-fix-german-logut.patch, NONE, 1.1 xfce4-session.spec, 1.28, 1.29

Wed Sep 9 23:48:55 UTC 2009

Author: cwickert

Update of /cvs/pkgs/rpms/xfce4-session/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27254

Modified Files:
	xfce4-session.spec 
Added Files:
	xfce4-session-4.6.1-correct-shadows.patch 
	xfce4-session-4.6.1-fix-german-logut.patch 
Log Message:
* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
- Fix German text in logout dialog
- Fix shadows in 'simple' splash engine
- Don't ship static lib in -devel package
- configure with --disable-static instead of removing *.a files


xfce4-session-4.6.1-correct-shadows.patch:
 simple.c |   10 ----------
 1 file changed, 10 deletions(-)

--- NEW FILE xfce4-session-4.6.1-correct-shadows.patch ---
--- xfce4-session/engines/simple/simple.c.orig	2006-09-02 19:27:37.000000000 +0200
+++ xfce4-session/engines/simple/simple.c	2006-10-06 15:19:59.000000000 +0200
@@ -202,7 +202,6 @@
 simple_next (XfsmSplashEngine *engine, const gchar *text)
 {
   Simple *simple = (Simple *) engine->user_data;
-  GdkColor shcolor;
   gint tw, th, tx, ty;
 
   pango_layout_set_text (simple->layout, text, -1);
@@ -220,15 +219,6 @@
 
   gdk_gc_set_clip_rectangle (simple->gc, &simple->textbox);
 
-  /* draw shadow */
-  shcolor.red = (simple->fgcolor.red + simple->bgcolor.red) / 2;
-  shcolor.green = (simple->fgcolor.green + simple->bgcolor.green) / 2;
-  shcolor.blue = (simple->fgcolor.blue + simple->bgcolor.blue) / 2;
-  shcolor.red = (shcolor.red + shcolor.green + shcolor.blue) / 3;
-  shcolor.green = shcolor.red;
-  shcolor.blue = shcolor.red;
-
-  gdk_gc_set_rgb_fg_color (simple->gc, &shcolor);
   gdk_draw_layout (simple->pixmap, simple->gc,
                    tx + 2, ty + 2, simple->layout);
 

xfce4-session-4.6.1-fix-german-logut.patch:
 de.po |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xfce4-session-4.6.1-fix-german-logut.patch ---
--- po/de.po	2009-04-15 10:14:23.000000000 +0200
+++ po/de.po.fixed	2009-09-10 01:02:19.000000000 +0200
@@ -332,7 +332,7 @@
 #: ../xfce4-session/shutdown.c:360
 #, c-format
 msgid "<span size='large'><b>Log out %s</b></span>"
-msgstr "<span·size='large'><b>%s abmelden</b></span>"
+msgstr "<span size='large'><b>%s abmelden</b></span>"
 
 #: ../xfce4-session/shutdown.c:401
 msgid "Log Out"


Index: xfce4-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce4-session/F-11/xfce4-session.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- xfce4-session.spec	21 Apr 2009 02:29:25 -0000	1.28
+++ xfce4-session.spec	9 Sep 2009 23:48:55 -0000	1.29
@@ -1,11 +1,15 @@
 Summary: Xfce session manager
 Name: xfce4-session
 Version: 4.6.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-%{version}/src/xfce4-session-%{version}.tar.bz2
 Patch0: xfce4-session-4.5.92-hide-tips.patch
+# http://patches.ubuntu.com/x/xfce4-session/extracted/01_correct_shadows.patch
+Patch1: xfce4-session-4.6.1-correct-shadows.patch
+# http://bugzilla.xfce.org/show_bug.cgi?id=5745
+Patch2: xfce4-session-4.6.1-fix-german-logut.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libxfcegui4 >= %{version}
@@ -46,9 +50,11 @@ Additional splash screen engines for the
 %prep
 %setup -q
 %patch0 -p1 -b .disable-tips
+%patch1 -p1 -b .correct-shadows
+%patch2 -p0 -b .german-fixed
 
 %build
-%configure --enable-gnome --enable-final
+%configure --enable-gnome --enable-final --disable-static
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -56,44 +62,33 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/*/*/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 %find_lang %{name}
 
 %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 &>/dev/null || :
 /sbin/ldconfig
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
 /sbin/ldconfig
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog ChangeLog.pre-xfce-devel NEWS README TODO
 %{_bindir}/*
 %{_datadir}/applications/*
-%{_datadir}/icons/hicolor/128x128/apps/xfce4-session.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-autostart-editor.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-session.png
-%{_datadir}/icons/hicolor/48x48/apps/xfce4-splash.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-logout.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-reboot.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-shutdown.png
-%{_datadir}/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
-%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
-%{_datadir}/icons/hicolor/72x72/apps/xfsm-trash-normal.png
-%{_datadir}/icons/hicolor/scalable/apps/xfce4-session.svg
-%{_datadir}/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-hibernate.png
-%{_datadir}/icons/hicolor/48x48/apps/xfsm-suspend.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/xfce4/doc/*/images/*
 %{_datadir}/xfce4/doc/*/*.html
 %dir %{_datadir}/xfce4/tips/
@@ -105,14 +100,12 @@ touch --no-create %{_datadir}/icons/hico
 %{_libdir}/xfce4/splash/engines/libmice.*
 %{_libexecdir}/xfsm-shutdown-helper
 %{_mandir}/man1/*
-%dir %{_sysconfdir}/xdg/autostart/
 %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 %config(noreplace) %{_sysconfdir}/xdg/autostart/xfce4-tips-autostart.desktop
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/xfce4/xfce4-session-4.6
 
@@ -124,6 +117,16 @@ touch --no-create %{_datadir}/icons/hico
 %{_libexecdir}/balou-*
 
 %changelog
+* Wed Sep 09 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.6.1-3
+- Fix German text in logout dialog
+- Fix shadows in 'simple' splash engine
+- Don't ship static lib in -devel package
+- configure with --disable-static instead of removing *.a files
+- Fix directory ownership issue
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
 - Update to 4.6.1
 


