rpms/emerald/devel emerald-theme-manager-desktop.patch, NONE, 1.1 emerald.spec, 1.16, 1.17

[Nikolay Vladimirov (turki)]

Author: turki

Update of /cvs/pkgs/rpms/emerald/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29491

Modified Files:
	emerald.spec 
Added Files:
	emerald-theme-manager-desktop.patch 
Log Message:
Updated to 0.7.6 + spec fixes

emerald-theme-manager-desktop.patch:

--- NEW FILE emerald-theme-manager-desktop.patch ---
--- emerald-0.7.6/misc/emerald-theme-manager.desktop	2008-05-31 12:05:37.000000000 +0300
+++ emerald-0.7.6/misc/emerald-theme-manager.desktop.fixed	2008-07-11 20:47:26.000000000 +0300
@@ -5,10 +5,9 @@ Name[fr]=Gestionnaire de thèmes Emerald
 Comment=Configure Emerald themes
 Comment[fr]=Configurerer les options des thèmes Emerald
 Icon=/usr/share/pixmaps/emerald-theme-manager-icon.png
-Exec=emerald-theme-manager
 Terminal=false
 Type=Application
-Categories=Settings;
-Exec=emerald-theme-manager -i 
+Categories=Settings;DesktopSettings
+Exec=emerald-theme-manager -i %f
 MimeType=application/x-emerald-theme;
 


Index: emerald.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/devel/emerald.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- emerald.spec	19 Feb 2008 07:35:35 -0000	1.16
+++ emerald.spec	11 Jul 2008 19:23:36 -0000	1.17
@@ -2,13 +2,13 @@
 Url:            http://www.compiz-fusion.org/
 License:        GPLv2
 Group:          User Interface/Desktops
-Version:        0.5.2
-Release:        4%{?dist}
+Version:        0.7.6
+Release:        1%{?dist}
 
 Summary:        Themeable window decorator and compositing manager for Compiz Fusion
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:        http://releases.compiz-fusion.org/%{version}/%{name}-%{version}.tar.bz2
-Patch0: 	 gcc43-buildfix.patch
+Patch0: 	    emerald-theme-manager-desktop.patch
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
@@ -41,19 +41,14 @@
 
 %prep
 %setup -q
-#fix gcc43 build 
-#http://bugs.opencompositing.org/show_bug.cgi?id=724
-%patch0 -p1 -b .gcc43
-# Should only have one Exec line in a desktop file...
-perl -pi -e 's|Exec=emerald-theme-manager -i|###|g' misc/emerald-theme-manager.desktop
-# Death to rpaths...
-perl -pi -e 's|hardcode_into_libs=.*|hardcode_into_libs=no|g' configure
-perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' configure
-perl -pi -e 's|runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' configure
-
+#fix menu entries
+#https://bugzilla.redhat.com/show_bug.cgi?id=286141
+%patch0 -p1 -b .fixed
 
 %build
 %configure --enable-librsvg --disable-mime-update
+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}
 
 
@@ -65,13 +60,6 @@
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
   $RPM_BUILD_ROOT%{_datadir}/applications/emerald-theme-manager.desktop
-# Fix up xy_XY to just xy
-for lang in tr_TR
-do
-  dest=$(echo ${lang} | cut -d_ -f1)
-  mv $RPM_BUILD_ROOT%{_datadir}/locale/${lang} \
-    $RPM_BUILD_ROOT%{_datadir}/locale/${dest}
-done
 %find_lang %{name}
 
 
@@ -114,6 +102,12 @@
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* Fri Jul 11 2008 Nikolay Vladimirov <nikolay at vladimiroff.com> - 0.7.6-1
+- new upstream release
+- removed gcc43 patch(upstream)
+- added .desktop file patch(fixes bz 286141)
+- spec file clean up
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.2-4
 - Autorebuild for GCC 4.3