rpms/tucnak2/devel tucnak2-2.25-sharedconf.patch, NONE, 1.1 tucnak2-2.25-soundwrapper.patch, NONE, 1.1 tucnak2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Lucian Langa lucilanga at fedoraproject.org
Thu Mar 19 05:54:24 UTC 2009


Author: lucilanga

Update of /cvs/pkgs/rpms/tucnak2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17589

Modified Files:
	.cvsignore sources 
Added Files:
	tucnak2-2.25-sharedconf.patch tucnak2-2.25-soundwrapper.patch 
	tucnak2.spec 
Log Message:
initial import

tucnak2-2.25-sharedconf.patch:

--- NEW FILE tucnak2-2.25-sharedconf.patch ---
diff -Naur tucnak2-2.25/src/cwdb.c tucnak2-2.25-mod/src/cwdb.c
--- tucnak2-2.25/src/cwdb.c	2008-09-01 21:01:11.000000000 +0300
+++ tucnak2-2.25-mod/src/cwdb.c	2009-03-13 10:59:38.000000000 +0200
@@ -122,11 +122,17 @@
 
 void read_cw_files(struct cw *cw){
     gchar *s;
+    int ret;
     
     load_cw_from_file(cw, "/etc/tucnakcw");
     s = g_strconcat(getenv("HOME"), "/tucnak/tucnakcw", NULL); 
-    load_cw_from_file(cw, s);
+    ret=load_cw_from_file(cw, s);
     g_free(s);
+    if (ret < 0) {
+		s = g_strconcat(SHAREDIR, "/tucnakcw", NULL);
+                load_cty_from_file(cw, s);
+    		g_free(s);
+    }
 }
 
 void save_one_cw(gpointer key, gpointer value, gpointer user_data){
diff -Naur tucnak2-2.25/src/dwdb.c tucnak2-2.25-mod/src/dwdb.c
--- tucnak2-2.25/src/dwdb.c	2008-12-23 09:59:51.000000000 +0200
+++ tucnak2-2.25-mod/src/dwdb.c	2009-03-13 10:59:23.000000000 +0200
@@ -493,14 +493,20 @@
     ret=load_cty_from_file(dw, s);
     g_free(s);
 	if (ret<0){
-    	load_cty_from_mem(dw, txt_cty, sizeof(txt_cty));
+		s = g_strconcat(SHAREDIR, "/cty.dat", NULL);
+    		ret=load_cty_from_file(dw, s);
+		if (ret<0)
+    			load_cty_from_mem(dw, txt_cty, sizeof(txt_cty));
 	}
     
     s = g_strconcat(getenv("HOME"), "/tucnak/tucnakdw", NULL);
     ret=load_dw_from_file(dw, s);
     g_free(s);
 	if (ret<0){
-    	load_dw_from_mem(dw, txt_tucnakdw, sizeof(txt_tucnakdw));
+		s = g_strconcat(SHAREDIR, "/tucnakdw", NULL);
+    		ret=load_cty_from_file(dw, s);
+		if (ret<0)
+    			load_dw_from_mem(dw, txt_tucnakdw, sizeof(txt_tucnakdw));
 	}
 }
 
diff -Naur tucnak2-2.25/src/excdb.c tucnak2-2.25-mod/src/excdb.c
--- tucnak2-2.25/src/excdb.c	2008-12-13 22:07:33.000000000 +0200
+++ tucnak2-2.25-mod/src/excdb.c	2009-03-13 11:03:36.000000000 +0200
@@ -203,11 +203,21 @@
     ret = load_exc_from_file(excdb, s);
     dbg("    %s %d\n", s, ret);
     g_free(s);
+    if (ret<0) {
+	s = g_strconcat(SHAREDIR, "/tucnakexc", NULL);
+        load_exc_from_file(excdb, s);
+        g_free(s);
+    }
     
     s = g_strconcat(getenv("HOME"), "/tucnak/tucnakvexc", ename, NULL); 
     ret = load_vexc_from_file(excdb, s);
     dbg("    %s %d\n", s, ret);
     g_free(s);
+    if (ret<0) {
+        s = g_strconcat(SHAREDIR, "/tucnakvexc", NULL);
+        load_vexc_from_file(excdb, s);
+        g_free(s);
+    }
     if (ret<0){
         dbg("disk loading failed, try to load memory defaults '%s'\n", ename);
         if (strcasecmp(ename, "agcw")==0) {
diff -Naur tucnak2-2.25/src/namedb.c tucnak2-2.25-mod/src/namedb.c
--- tucnak2-2.25/src/namedb.c	2007-03-01 20:00:59.000000000 +0200
+++ tucnak2-2.25-mod/src/namedb.c	2009-03-13 11:05:20.000000000 +0200
@@ -79,11 +79,17 @@
 
 void read_namedb_files(struct namedb *namedb){
     gchar *s;
+    int ret;
     
     load_namedb_from_file(namedb, SHAREDIR"/tucnaknames");
     s = g_strconcat(getenv("HOME"), "/tucnak/tucnaknames", NULL); 
-    load_namedb_from_file(namedb, s);
+    ret = load_namedb_from_file(namedb, s);
     g_free(s);
+    if (ret<0) {
+        s = g_strconcat(SHAREDIR, "/tucnaknames", NULL); 
+        load_namedb_from_file(namedb, s);
+        g_free(s);
+    }
 }
 
 int namedb_ret;
diff -Naur tucnak2-2.25/src/wizz.c tucnak2-2.25-mod/src/wizz.c
--- tucnak2-2.25/src/wizz.c	2008-12-26 19:11:53.000000000 +0200
+++ tucnak2-2.25-mod/src/wizz.c	2009-03-13 11:11:07.000000000 +0200
@@ -174,6 +174,11 @@
     s = g_strconcat(getenv("HOME"), "/tucnak/tucnakwiz", NULL); 
     ret=load_wizz_from_file(wizz, s);
     g_free(s);
+    if (ret<0) {
+    	s = g_strconcat(SHAREDIR, "/tucnakwiz", NULL); 
+    	ret=load_wizz_from_file(wizz, s);
+        g_free(s);
+    }
     if (ret<0){
         load_wizz_from_file(wizz, NULL);
     }

tucnak2-2.25-soundwrapper.patch:

--- NEW FILE tucnak2-2.25-soundwrapper.patch ---
diff -Naur tucnak2-2.25/src/Makefile.in tucnak2-2.25-mod/src/Makefile.in
--- tucnak2-2.25/src/Makefile.in	2009-02-22 11:00:30.000000000 +0200
+++ tucnak2-2.25-mod/src/Makefile.in	2009-03-12 12:27:41.000000000 +0200
@@ -81,14 +81,14 @@
 TUCNAK_LDADD = @TUCNAK_LDADD@
 VERSION = @VERSION@
 
-bin_PROGRAMS = tucnak soundwrapper 
+bin_PROGRAMS = tucnak tucnak2-soundwrapper 
 
 tucnak_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc 	control.c cor.c cor.h cordata.c cordata.h cordata.inc 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c 	error.c excdb.c fhs.c fifo.c font.c font.inc gfx_png.c ghash.c 	gptrarray.c hash.c header.h html.c iarray.c iarray.h 	icons.c icons.h icons.inc img_png.c inpout.c inputln.c interfaces.c interfaces.h kbd.c 	kbdbind.c language.c language.h language.inc loc.c main.c map.c 	menu.c menu1.c menu2.c menu3.c menu4.c menu5.c namedb.c net.c ntpq.c 	os_dep.c os_dep.h oss.c ppdev.c rc.c regex.c report.c rotar.c 	qsodb.c scandir.c sdev.c sdl.c 	select.c session.c settings.c setup.h sked.c 	ssbd.c stats.c subwin.c terminal.c threadpipe.c titlpage.c trig.c 	ttys.c txts.c txts.h txts.inc uni_7b.inc winkey.c wizz.c zstring.c
 
 
 tucnak_LDADD = @TUCNAK_LDADD@
 
-soundwrapper_SOURCES = soundwrapper.c	
+tucnak2-soundwrapper_SOURCES = soundwrapper.c	
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -111,10 +111,10 @@
 zstring.o
 tucnak_DEPENDENCIES = 
 tucnak_LDFLAGS = 
-soundwrapper_OBJECTS =  soundwrapper.o
-soundwrapper_LDADD = $(LDADD)
-soundwrapper_DEPENDENCIES = 
-soundwrapper_LDFLAGS = 
+tucnak2-soundwrapper_OBJECTS =  soundwrapper.o
+tucnak2-soundwrapper_LDADD = $(LDADD)
+tucnak2-soundwrapper_DEPENDENCIES = 
+tucnak2-soundwrapper_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -126,8 +126,8 @@
 
 TAR = tar
 GZIP_ENV = --best
-SOURCES = $(tucnak_SOURCES) $(soundwrapper_SOURCES)
-OBJECTS = $(tucnak_OBJECTS) $(soundwrapper_OBJECTS)
+SOURCES = $(tucnak_SOURCES) $(tucnak2-soundwrapper_SOURCES)
+OBJECTS = $(tucnak_OBJECTS) $(tucnak2-soundwrapper_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -188,9 +188,9 @@
 	@rm -f tucnak
 	$(LINK) $(tucnak_LDFLAGS) $(tucnak_OBJECTS) $(tucnak_LDADD) $(LIBS)
 
-soundwrapper: $(soundwrapper_OBJECTS) $(soundwrapper_DEPENDENCIES)
-	@rm -f soundwrapper
-	$(LINK) $(soundwrapper_LDFLAGS) $(soundwrapper_OBJECTS) $(soundwrapper_LDADD) $(LIBS)
+tucnak2-soundwrapper: $(tucnak2-soundwrapper_OBJECTS) $(tucknak2-soundwrapper_DEPENDENCIES)
+	@rm -f tucnak2-soundwrapper
+	$(LINK) $(tucnak2-soundwrapper_LDFLAGS) $(tucnak2-soundwrapper_OBJECTS) $(tucnak2-soundwrapper_LDADD) $(LIBS)
 
 tags: TAGS
 
diff -Naur tucnak2-2.25/src/os_dep.c tucnak2-2.25-mod/src/os_dep.c
--- tucnak2-2.25/src/os_dep.c	2008-11-21 09:49:57.000000000 +0200
+++ tucnak2-2.25-mod/src/os_dep.c	2009-03-12 12:24:33.000000000 +0200
@@ -1608,7 +1608,7 @@
     dup2(fds[0], 0);
     close(fds[0]);
     for (i=3;i<1024;i++) close(i);
-    execlp("soundwrapper", "soundwrapper", NULL);
+    execlp("tucnak2-soundwrapper", "tucnak2-soundwrapper", NULL);
 	exit(-1);
 }
 


--- NEW FILE tucnak2.spec ---
Name:           tucnak2
Version:        2.25
Release:        1%{?dist}
Summary:        VHF contest logging program

Group:          Applications/Communications
License:        GPLv2+
URL:            http://tucnak.nagano.cz/wiki/Main_Page
Source0:        http://tucnak.nagano.cz/%{name}-%{version}.tar.gz
Patch0:         tucnak2-2.25-soundwrapper.patch
Patch1:         tucnak2-2.25-sharedconf.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  SDL-devel, glib2-devel, libpng-devel, libsndfile-devel
BuildRequires:  gpm-devel, alsa-lib-devel, hamlib-devel, libusb-devel
BuildRequires:  desktop-file-utils
BuildRequires:  libftdi-devel
#Requires:       

%description
Tucnak2 is VHF/UHF/SHF log for hamradio contests. It supports multi
bands, free input, networking, voice and CW keyer, WWL database and
much more.

%prep
%setup -q
%patch0 -p1 -b .soundwrapper
%patch1 -p1 -b .sharedconf
sed -i -e "s/Encoding=UTF-8//g" -e "s/Categories=HamRadio/Categories=HamRadio;/g" share/applications/%{name}.desktop

#all files must be UTF-8
recode()
{
        iconv -f "$2" -t utf-8 < "$1" > "${1}_"
        touch -r "$1" "${1}_"
        mv -f "${1}_" "$1"

}
recode TODO iso-8859-15

%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/tac2tuc.pl

#don't include these twice
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc
#remove old README file
rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/README

desktop-file-install \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%doc doc/NAVOD.pdf doc/NAVOD.sxw
%doc data/*.html data/*.png
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/%{name}


%changelog
* Thu Mar 12 2009 Lucian Langa <cooly at gnome.eu.org> - 2.25-1
- new upstream release
- update patch0
- fix recode function to preserve timestamps

* Sun Dec 07 2008 Lucian Langa <cooly at gnome.eu.org> - 2.21-1
- rename too generic file soundwrapper 
- new upstream 2.21

* Wed Dec 03 2008 Lucian Langa <cooly at gnome.eu.org> - 2.19-1
- drop patch0 and use upstream desktop file
- new upstream 2.19

* Fri Nov 21 2008 Lucian Langa <cooly at gnome.eu.org> - 2.14-2
- update BR
- preserve timestamps

* Mon Sep 26 2008 Lucian Langa <cooly at gnome.eu.org> - 2.14-1
- new upstream 2.14
- update build requires

* Mon Sep 01 2008 Lucian Langa <cooly at gnome.eu.org> - 2.13-2
- new upstream 2.13

* Mon Dec 10 2007 Sindre Pedersen Bjørdal - 2.07-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2009 03:36:56 -0000	1.1
+++ .cvsignore	19 Mar 2009 05:53:54 -0000	1.2
@@ -0,0 +1 @@
+tucnak2-2.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tucnak2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2009 03:36:56 -0000	1.1
+++ sources	19 Mar 2009 05:53:54 -0000	1.2
@@ -0,0 +1 @@
+560ea856eb48b6e3be23193e31428033  tucnak2-2.25.tar.gz




More information about the fedora-extras-commits mailing list