From 8afc0c064d2bc84d3e2b8683faef825521d83eb1 Mon Sep 17 00:00:00 2001
From: Nikolay Vladimirov <turki@fedoraproject.org>
Date: Jul 11 2008 19:25:58 +0000
Subject: Updated to 0.7.6 + spec fixes


---

diff --git a/.cvsignore b/.cvsignore
index 5cedf28..aa893cf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -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
diff --git a/emerald-theme-manager-desktop.patch b/emerald-theme-manager-desktop.patch
new file mode 100644
index 0000000..9d31583
--- /dev/null
+++ b/emerald-theme-manager-desktop.patch
@@ -0,0 +1,15 @@
+--- 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;
+ 
diff --git a/emerald.spec b/emerald.spec
index 1aa6a41..b98a57b 100644
--- a/emerald.spec
+++ b/emerald.spec
@@ -2,13 +2,13 @@ Name:           emerald
 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 @@ for emerald, the themeable window decorator for Compiz.
 
 %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 @@ desktop-file-install --vendor fedora --delete-original \
   --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 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{_libdir}/libemeraldengine.so
 
 %changelog
+* Fri Jul 11 2008 Nikolay Vladimirov <nikolay@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@fedoraproject.org> - 0.5.2-4
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index f406e78..8bf05fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-149c17b0a1bddf29e1cd66d29777d96e  emerald-0.5.2.tar.bz2
+340f4dafde5d6c55bd05c0033aa7d6fe  emerald-0.7.6.tar.bz2