rpms/tilda/F-8 sources,1.2,1.3 tilda.spec,1.1,1.2

[Xavier LAMIEN (laxathom)]

Author: laxathom

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

Modified Files:
	sources tilda.spec 
Log Message:
update release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tilda/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2007 21:45:05 -0000	1.2
+++ sources	20 Jun 2008 15:35:51 -0000	1.3
@@ -1 +1 @@
-773d47e3985f7e778b662a38b053c1df  tilda-0.9.4.tar.gz
+c497f82f180e128a1e6f301c6b2463d9  tilda-0.9.5.tar.gz


Index: tilda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tilda/F-8/tilda.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tilda.spec	12 Feb 2007 21:45:05 -0000	1.1
+++ tilda.spec	20 Jun 2008 15:35:51 -0000	1.2
@@ -1,17 +1,18 @@
 Name:           tilda
-Version:        0.9.4
-Release:        6%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        A quake like terminal for GNOME
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://tilda.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz
-Patch0:         tilda-segfault-fix.patch
+#Patch0:         tilda-segfault-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, pango-devel, vte-devel
-BuildRequires:  libconfuse-devel, libXt-devel
+BuildRequires:  libconfuse-devel, libXt-devel, flex
+BuildRequires:  libglade2-devel
 
 %description
 Tilda is a Linux terminal taking after the likeness of many classic terminals
@@ -21,8 +22,12 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .segfix
-echo "Comment=A quake like terminal for GNOME" >> tilda.desktop
+#%patch0 -p1 -b .segfix
+
+# Fix default installed dir
+sed -i 's|%{prefix}/share|%{_datadir}/%{name}|g' src/Makefile.in
+sed -i 's|"tilda.glade"|"/%{name}/%{name}.glade"|g' src/wizard.c
+
 
 %build
 %configure
@@ -31,8 +36,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+
 make install DESTDIR=$RPM_BUILD_ROOT
-desktop-file-install --delete-original --vendor="fedora"       \
+desktop-file-install --vendor=""       \
         --dir=$RPM_BUILD_ROOT/%{_datadir}/applications         \
         --mode 0644                                            \
         --remove-category="Application"                        \
@@ -42,6 +49,10 @@
 install -D -p -m 644 %{name}.png \
         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
+# Move glade interface to correct dir
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}.glade $RPM_BUILD_ROOT%{_datadir}/%{name}/
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -50,11 +61,15 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog TODO
 %{_bindir}/%{name}
+%{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Thu Jun 12 2008 Xavier Lamien <lxtnow at gmail.com> - 0.9.5-1
+- Updated Release.
+
 * Mon Jan 22 2007 Josef Whiter <josef at toxicpanda.com> 0.9.4-6
 - fix segfault when specifying invalid keybinding