rpms/emerald/F-8 emerald-theme-manager-desktop.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 emerald.spec, 1.14, 1.15 sources, 1.10, 1.11

[Nikolay Vladimirov (turki)]

Author: turki

Update of /cvs/pkgs/rpms/emerald/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv405

Modified Files:
	.cvsignore emerald.spec sources 
Added Files:
	emerald-theme-manager-desktop.patch 
Log Message:
Update to 0.7.6

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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/F-8/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Oct 2007 15:20:18 -0000	1.10
+++ .cvsignore	12 Jul 2008 14:31:00 -0000	1.11
@@ -1,9 +1 @@
-emerald-0.1.2.tar.bz2
-emerald-0.1.3.tar.bz2
-emerald-0.1.4.tar.bz2
-emerald-0.1.99.2.tar.bz2
-emerald-0.1.9999.1.tar.bz2
-emerald-0.1.9999.2.tar.bz2
-emerald-0.2.0.tar.bz2
-emerald-0.2.1.tar.bz2
-emerald-0.5.2.tar.bz2
+emerald-0.7.6.tar.bz2


Index: emerald.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/F-8/emerald.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- emerald.spec	8 Oct 2007 15:35:24 -0000	1.14
+++ emerald.spec	12 Jul 2008 14:31:00 -0000	1.15
@@ -2,12 +2,13 @@
 Url:            http://www.compiz-fusion.org/
 License:        GPLv2
 Group:          User Interface/Desktops
-Version:        0.5.2
-Release:        2%{?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: 	    emerald-theme-manager-desktop.patch
 
 # libdrm is not available on these arches
 ExcludeArch:    s390 s390x
@@ -40,16 +41,14 @@
 
 %prep
 %setup -q
-# 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}
 
 
@@ -61,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}
 
 
@@ -110,6 +102,18 @@
 %{_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
+
+* Fri Jan 04 2008 Adel Gadllah <adel.gadllah at gmail.com> 0.5.2-3
+- Fix gcc43 build
+
 * Mon Oct 08 2007 Jarod Wilson <jwilson at redhat.com> 0.5.2-2
 - Disable ppc64 build (no compiz-devel.ppc64)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emerald/F-8/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Oct 2007 15:20:18 -0000	1.10
+++ sources	12 Jul 2008 14:31:00 -0000	1.11
@@ -1 +1 @@
-149c17b0a1bddf29e1cd66d29777d96e  emerald-0.5.2.tar.bz2
+340f4dafde5d6c55bd05c0033aa7d6fe  emerald-0.7.6.tar.bz2