rpms/tilda/FC-5 tilda-segfault-fix.patch, 1.2, 1.3 tilda.spec, 1.2, 1.3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4

Josef Whiter (josef) fedora-extras-commits at redhat.com
Thu Feb 15 17:46:11 UTC 2007


Author: josef

Update of /cvs/extras/rpms/tilda/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23442

Modified Files:
	.cvsignore sources 
Added Files:
	tilda-segfault-fix.patch tilda.spec 
Log Message:
copying stuff over to get this to work


tilda-segfault-fix.patch:

Index: tilda-segfault-fix.patch
===================================================================
RCS file: tilda-segfault-fix.patch
diff -N tilda-segfault-fix.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tilda-segfault-fix.patch	15 Feb 2007 17:45:39 -0000	1.3
@@ -0,0 +1,14 @@
+--- tilda-0.9.4/src/key_grabber.c.josef	2007-01-22 11:43:36.000000000 -0500
++++ tilda-0.9.4/src/key_grabber.c	2007-01-22 11:43:49.000000000 -0500
+@@ -241,8 +241,10 @@ static void key_grab (tilda_window *tw)
+     if (strstr(tmp_key, "None"))
+         modmask = 0;
+ 
+-    if (!strstr(tmp_key, "+"))
++    if (!strstr(tmp_key, "+")) {
+         perror ("Key Incorrect -- Read the README or tilda.sf.net for info, rerun as 'tilda -C' to set keybinding\n");
++        return;
++    }
+ 
+     if (strtok(tmp_key, "+"))
+         key = XStringToKeysym(strtok(NULL, "+"));


Index: tilda.spec
===================================================================
RCS file: tilda.spec
diff -N tilda.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tilda.spec	15 Feb 2007 17:45:39 -0000	1.3
@@ -0,0 +1,79 @@
+Name:           tilda
+Version:        0.9.4
+Release:        6%{?dist}
+Summary:        A quake like terminal for GNOME
+
+Group:          Applications/System
+License:        GPL
+URL:            http://tilda.sourceforge.net/
+Source0:        http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz
+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
+
+%description
+Tilda is a Linux terminal taking after the likeness of many classic terminals
+from first person shooter games, Quake, Doom and Half-Life (to name a few),
+where the terminal has no border and is hidden from the desktop until a key is
+pressed.
+
+%prep
+%setup -q
+%patch0 -p1 -b .segfix
+echo "Comment=A quake like terminal for GNOME" >> tilda.desktop
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-install --delete-original --vendor="fedora"       \
+        --dir=$RPM_BUILD_ROOT/%{_datadir}/applications         \
+        --mode 0644                                            \
+        --remove-category="Application"                        \
+        --copy-name-to-generic-name                            \
+        $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+
+install -D -p -m 644 %{name}.png \
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README ChangeLog TODO
+%{_bindir}/%{name}
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+%{_datadir}/applications/fedora-%{name}.desktop
+
+%changelog
+* Mon Jan 22 2007 Josef Whiter <josef at toxicpanda.com> 0.9.4-6
+- fix segfault when specifying invalid keybinding
+
+* Mon Jan 22 2007 Josef Whiter <josef at toxicpanda.com> 0.9.4-5
+- install icon into the size specific folder as well
+
+* Mon Jan 22 2007 Josef Whiter <josef at toxicpanda.com> 0.9.4-4
+- fixed changelog entry 
+- removed NEWS from the %%doc section
+- removed gettext from the BR
+- added libXt-devel as a BR
+- added --remove-category and --copy-name-to-generic name to the desktop-file-install
+- added a comment to the desktop file
+
+* Fri Jan 12 2007 Josef Whiter <josef at toxicpanda.com> 0.9.4-3
+- Removed my ghetto doc install script and added %%doc section
+
+* Thu Jan 11 2007 Josef Whiter <josef at toxicpanda.com> 0.9.4-2
+- Added BR for libconfuse-devel
+
+* Thu Jan 11 2007 Josef Whiter <josef at toxicpanda.com> 0.9.4-1
+- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tilda/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Feb 2007 17:42:25 -0000	1.3
+++ .cvsignore	15 Feb 2007 17:45:39 -0000	1.4
@@ -0,0 +1 @@
+tilda-0.9.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tilda/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Feb 2007 17:42:25 -0000	1.3
+++ sources	15 Feb 2007 17:45:39 -0000	1.4
@@ -0,0 +1 @@
+773d47e3985f7e778b662a38b053c1df  tilda-0.9.4.tar.gz




More information about the scm-commits mailing list