rpms/gtkterm/FC-5 gtkterm-0.99.5-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gtkterm.desktop, 1.1, 1.2 gtkterm.spec, 1.7, 1.8 sources, 1.2, 1.3

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Fri Mar 31 20:49:41 UTC 2006


Author: jwrdegoede

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

Modified Files:
	.cvsignore gtkterm.desktop gtkterm.spec sources 
Added Files:
	gtkterm-0.99.5-fixes.patch 
Log Message:
* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
- Taking over as new FE maintainer
- Bump to new upstream 0.99.5


gtkterm-0.99.5-fixes.patch:

--- NEW FILE gtkterm-0.99.5-fixes.patch ---
--- gtkterm-0.99.5/src/macros.c~	2006-03-31 22:04:21.000000000 +0200
+++ gtkterm-0.99.5/src/macros.c	2006-03-31 22:04:21.000000000 +0200
@@ -59,7 +59,7 @@
   guchar a;
   guint val_read;
   
-  string = macros[(gint)number].action;
+  string = macros[(long)number].action;
   length = strlen(string);
   
   for(i = 0; i < length; i++)
@@ -140,7 +140,7 @@
 	}
     }
 
-  str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut);
+  str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(long)number].shortcut);
   Put_temp_message(str, 800);
   g_free(str);
 }
@@ -160,7 +160,7 @@
 
 void add_shortcuts(void)
 {
-  gint i = 0;
+  long i = 0;
   guint acc_key;
   GdkModifierType mod;
 
--- gtkterm-0.99.5/src/fichier.c~	2006-03-31 22:02:49.000000000 +0200
+++ gtkterm-0.99.5/src/fichier.c	2006-03-31 22:02:49.000000000 +0200
@@ -153,7 +153,7 @@
   else
     {
       g_free(str);
-      str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno));
+      str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror(errno));
       show_message(str, MSG_ERR);
     }
   return FALSE;
@@ -202,7 +202,7 @@
 	{
 	  /* Problem while writing, stop file transfer */
 	  g_free(str);
-	  str = g_strdup_printf(_("Cannot write file %s\n"), strerror_utf8(errno));
+	  str = g_strdup_printf(_("Cannot write file %s\n"), strerror(errno));
 	  show_message(str, MSG_ERR);
 	  close_all();
 	  return;
@@ -298,7 +298,7 @@
   if(Fic == NULL)
     {
       g_free(str);
-      str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno));
+      str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror(errno));
       show_message(str, MSG_ERR);
     }
   else


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:34 -0000	1.2
+++ .cvsignore	31 Mar 2006 20:49:41 -0000	1.3
@@ -1 +1,2 @@
-gtkterm-0.99.4.tar.gz
+gtkterm-0.99.5.tar.gz
+gtkterm.png


Index: gtkterm.desktop
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-5/gtkterm.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkterm.desktop	8 Nov 2004 04:31:34 -0000	1.1
+++ gtkterm.desktop	31 Mar 2006 20:49:41 -0000	1.2
@@ -1,7 +1,12 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=GTKTerm
-Comment=Serial port terminal
+GenericName=Serial port terminalemulator
+Comment=Targeted at developers, with hexview, etc.
 Exec=gtkterm
+Icon=gtkterm.png
 Terminal=false
+StartupNotify=false
 Type=Application
-Categories=Utility;Application;
+Categories=Application;Utility;
+Version=0.99.5


Index: gtkterm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-5/gtkterm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkterm.spec	2 Mar 2006 21:30:15 -0000	1.7
+++ gtkterm.spec	31 Mar 2006 20:49:41 -0000	1.8
@@ -1,59 +1,81 @@
 Name:           gtkterm
-Version:        0.99.4
-Release:        4
-
+Version:        0.99.5
+Release:        1%{?dist}
 Summary:        Serial port terminal
-
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.jls-info.com/julien/linux
-Source0:        http://www.jls-info.com/julien/linux/gtkterm-0.99.4.tar.gz
+Source0:        http://www.jls-info.com/julien/linux/%{name}-%{version}.tar.gz
 Source1:        gtkterm.desktop
+Source2:        gtkterm.png
+Patch0:         gtkterm-0.99.5-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel gettext bison desktop-file-utils vte-devel zlib-devel ncurses-devel
+BuildRequires:  gtk2-devel gettext bison desktop-file-utils vte-devel
+BuildRequires:  zlib-devel ncurses-devel
 
 %description
 Simple GUI terminal used to communicate with the serial port.
 Similar to minicom or hyperterminal.
 
-%prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
+%prep
 %setup -q
+%patch0 -p1
 
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-install -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --vendor fedora \
-        --add-category X-Fedora      \
-        --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
-%SOURCE1
+
+# below is the desktop file and icon stuff.
+mkdir $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor fedora            \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora                       \
+  %{SOURCE1}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+install -p -m 644 %{SOURCE2} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_datadir}/applications/*
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
 
 %changelog
+* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
+- Taking over as new FE maintainer
+- Bump to new upstream 0.99.5
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:34 -0000	1.2
+++ sources	31 Mar 2006 20:49:41 -0000	1.3
@@ -1 +1,2 @@
-5539c7e2aaf56bfd551a72552f1ff146  gtkterm-0.99.4.tar.gz
+007ce7810466396b6452dea9c57c5f02  gtkterm-0.99.5.tar.gz
+9e25fa8914f415a1d9f6d60801752b6a  gtkterm.png




More information about the fedora-extras-commits mailing list