rpms/echolinux/devel echolinux-0.17a-gcc.patch, NONE, 1.1 echolinux-0.17a-includes.patch, NONE, 1.1 echolinux-0.17a-installdir.patch, NONE, 1.1 echolinux-0.17a-nostatic.patch, NONE, 1.1 echolinux-0.17a-optflags.patch, NONE, 1.1 echolinux.spec, NONE, 1.1 generate-echolinux-tarball.sh, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Lucian Langa]

Author: lucilanga

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

Modified Files:
	.cvsignore sources 
Added Files:
	echolinux-0.17a-gcc.patch echolinux-0.17a-includes.patch 
	echolinux-0.17a-installdir.patch 
	echolinux-0.17a-nostatic.patch echolinux-0.17a-optflags.patch 
	echolinux.spec generate-echolinux-tarball.sh 
Log Message:
* Fri Mar 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.17a-4
- license tag fix
- fix compiler flags

echolinux-0.17a-gcc.patch:

--- NEW FILE echolinux-0.17a-gcc.patch ---
--- echolinux-0.17a/echolinux/Makefile	2004-02-14 20:51:57.000000000 +0200
+++ echolinux-0.17a-mod/echolinux/Makefile	2008-09-14 14:54:04.000000000 +0300
@@ -8,7 +8,7 @@
 
 #CCFLAGS =  -DAUDIO_BLOCKING -DLINUX -DHALF_CONTROL -DM_LITTLE_ENDIAN
 CCFLAGS =
-CC = gcc -O3 # for GNU's gcc compiler
+CC = gcc # for GNU's gcc compiler
 LFLAGS = -lgsm -lm
 
 INTERNET_PORT = 2074

echolinux-0.17a-includes.patch:

--- NEW FILE echolinux-0.17a-includes.patch ---
--- echolinux-0.17a/echogui/testgui_main.c	2006-02-24 22:23:37.000000000 +0200
+++ echolinux-0.17a-mod/echogui/testgui_main.c	2008-09-08 20:45:26.000000000 +0300
@@ -16,7 +16,7 @@
 #include <linux/soundcard.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <X11/forms.h>
+#include <forms.h>
 #include <string.h>
 #include <math.h>
 #include <pthread.h>
--- echolinux-0.17a/echogui/testgui_cb.c	2006-02-24 21:28:15.000000000 +0200
+++ echolinux-0.17a-mod/echogui/testgui_cb.c	2008-09-08 20:45:46.000000000 +0300
@@ -14,7 +14,7 @@
 #include <linux/soundcard.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
-#include <X11/forms.h>
+#include <forms.h>
 #include <math.h>
 #include <signal.h>
 #include <pthread.h>
--- echolinux-0.17a/echogui/testgui.c	2006-02-24 21:28:15.000000000 +0200
+++ echolinux-0.17a-mod/echogui/testgui.c	2008-09-08 20:45:57.000000000 +0300
@@ -1,6 +1,6 @@
 /* Form definition file generated with fdesign. */
 
-#include <X11/forms.h>
+#include <forms.h>
 #include <stdlib.h>
 #include "testgui.h"
 

echolinux-0.17a-installdir.patch:

--- NEW FILE echolinux-0.17a-installdir.patch ---
--- echolinux-0.17a/echolinux/Makefile	2004-02-14 20:51:57.000000000 +0200
+++ echolinux-0.17a-mod/echolinux/Makefile	2008-09-14 13:22:20.000000000 +0300
@@ -46,8 +46,8 @@
 	cp -f *.wav ~/.echoLinux 
 
 install: 
-	cp echolinux /usr/local/bin/echolinux; \
-	cp echoaudio /usr/local/bin/echoaudio
+	cp echolinux $(DESTDIR)$(bindir)/echolinux; \
+	cp echoaudio $(DESTDIR)$(bindir)/echoaudio
 
 clean:
 	rm -f *.o $(PROGRAMS)
--- echolinux-0.17a/echogui/Makefile	2004-02-14 20:52:14.000000000 +0200
+++ echolinux-0.17a-mod/echogui/Makefile	2008-09-14 13:22:03.000000000 +0300
@@ -34,7 +34,7 @@
 	cp -f servers.txt ~/.echoLinux  
 
 install: 
-	cp echogui /usr/local/bin/echogui
+	cp echogui $(DESTDIR)$(bindir)/echogui
 
 clean:
 	rm -f *.o echogui

echolinux-0.17a-nostatic.patch:

--- NEW FILE echolinux-0.17a-nostatic.patch ---
--- echolinux-0.17a/echolinux/Makefile	2004-02-14 20:51:57.000000000 +0200
+++ echolinux-0.17a-mod/echolinux/Makefile	2008-10-26 15:11:12.000000000 +0200
@@ -9,7 +9,7 @@
 #CCFLAGS =  -DAUDIO_BLOCKING -DLINUX -DHALF_CONTROL -DM_LITTLE_ENDIAN
 CCFLAGS =
 CC = gcc -O3 # for GNU's gcc compiler
-LFLAGS = -lm
+LFLAGS = -lgsm -lm
 
 INTERNET_PORT = 2074
 
@@ -25,11 +25,11 @@
 all:	$(PROGRAMS)
 
 echolinux: control.o rtpacket.o
-	$(CC) control.o rtpacket.o $(CFLAGS) libgsm.a \
+	$(CC) control.o rtpacket.o $(CFLAGS) \
 	$(LFLAGS) -o echolinux 
 
 echoaudio: vox.o 
-	$(CC) vox.o $(CFLAGS) libgsm.a $(LFLAGS) -o echoaudio 
+	$(CC) vox.o $(CFLAGS) $(LFLAGS) -o echoaudio 
 
 control.o: control.c $(INCS)
 	$(CC) -c $(CFLAGS) control.c 

echolinux-0.17a-optflags.patch:

--- NEW FILE echolinux-0.17a-optflags.patch ---
--- echolinux-0.17a/echogui/Makefile	2004-02-14 20:52:14.000000000 +0200
+++ echolinux-0.17a-mod/echogui/Makefile	2009-03-13 08:01:02.000000000 +0200
@@ -1,6 +1,7 @@
 RELS = testgui.h
 OBJS = testgui_main.o testgui_cb.o testgui.o servercode.o threadFuncs.o
 
+CFLAGS = 
 
 CARGS = -DNodeFont=FL_TINY_SIZE -DChatFont=FL_SMALL_SIZE \
 	-DInfoFont=FL_TINY_SIZE -D_REENTRANT
@@ -15,19 +16,19 @@
 	$(OBJS)
 
 testgui_main.o : testgui_main.c $(RELS)
-	cc -c -o testgui_main.o $(CARGS) $(INC) testgui_main.c
+	cc -c -o testgui_main.o $(CFLAGS) $(CARGS) $(INC) testgui_main.c
 
 testgui_cb.o : testgui_cb.c $(RELS)
-	gcc -c -o testgui_cb.o $(CARGS) $(INC) testgui_cb.c
+	gcc -c -o testgui_cb.o $(CFLAGS) $(CARGS) $(INC) testgui_cb.c
 
 testgui.o : testgui.c $(RELS)
-	gcc -c -o testgui.o $(CARGS) $(INC) testgui.c
+	gcc -c -o testgui.o $(CFLAGS) $(CARGS) $(INC) testgui.c
 
 servercode.o : servercode.c $(RELS)
-	gcc -c -o servercode.o $(CARGS) $(INC) servercode.c
+	gcc -c -o servercode.o $(CFLAGS) $(CARGS) $(INC) servercode.c
 
 threadFuncs.o : threadFuncs.c $(RELS)
-	gcc -c -o threadFuncs.o $(CARGS) $(INC) threadFuncs.c
+	gcc -c -o threadFuncs.o $(CFLAGS) $(CARGS) $(INC) threadFuncs.c
 
 copy_defaults:
 	if [ ! -d ~/.echoLinux ]; then mkdir ~/.echoLinux; fi; \


--- NEW FILE echolinux.spec ---
Name:		echolinux
Version:	0.17a
Release:	4%{?dist}
Summary:	Linux echoLink client

Group:		Applications/Communications	
License:	GPL+
URL:		http://cqinet.sourceforge.net/
Source0:	echolinux-0.17a-nogsm.tar.gz
# We do not know the license for gsm.h (and libgsm.a)
# We use this script to remove gsm.h and libgsm.a before shipping it.
# Download the upstream tarball and invoke this script while in the
# tarball's directory:
# ./generate-echolinux-tarball.sh 1.0
Source1: generate-echolinux-tarball.sh
#xform changed include paths - https://sourceforge.net/tracker/index.php?func=detail&aid=2198156&group_id=56357&atid=480282
Patch0:		echolinux-0.17a-includes.patch
#allow env install paths - https://sourceforge.net/tracker/index.php?func=detail&aid=2198185&group_id=56357&atid=480282
Patch1:		echolinux-0.17a-installdir.patch
#do not link against static library (packaged .la file) - https://sourceforge.net/tracker/index.php?func=detail&aid=2198200&group_id=56357&atid=480282
Patch2:		echolinux-0.17a-nostatic.patch
#prefer -O2 instead of -O3
Patch3:		echolinux-0.17a-gcc.patch
Patch4:		echolinux-0.17a-optflags.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xforms-devel, libXpm-devel, gsm-devel, desktop-file-utils
#Requires:	

%description
EchoLinux is a "command line" driven engine that performs all of the actions
necessary to initiate sessions, accept connections and maintain connections
with other echoLink users. It also handles the compression/decompression of
the audio stream.

%prep
%setup -q
%patch0 -p1 -b .includes
%patch1 -p1 -b .installdir
%patch2 -p1 -b .nostatic
%patch3 -p1 -b .gcc
%patch4 -p1 -b .optflags
%{__sed} -i 's/\r//' Using_EchoLinux.txt
%{__sed} -i 's/Encoding=UTF-8//g' %{name}.desktop
%{__sed} -i 's/.png//g' %{name}.desktop
%{__sed} -i 's/Application;Network;/HamRadio;/g' %{name}.desktop


%build
make %{?_smp_mflags} -e CFLAGS="%{optflags}"


%install
rm -rf %{buildroot}
#fix perms on packages file
chmod -x README
mkdir -p %{buildroot}%{_bindir}
make install DESTDIR=%{buildroot}%{_bindir} INSTALL="install -p"
mkdir -p %{buildroot}%{_datadir}/pixmaps/
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
cp echolinux/*.txt echolinux/*.wav %{buildroot}%{_sysconfdir}/%{name}
cp pixmaps/echolinux_48x48.png %{buildroot}%{_datadir}/pixmaps/
desktop-file-install \
	--dir=%{buildroot}%{_datadir}/applications %{name}.desktop


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc gpl.txt README Using_EchoLinux.txt
%{_bindir}/echoaudio
%{_bindir}/echogui
%{_bindir}/echolinux
%config(noreplace) %{_sysconfdir}/echolinux
%{_datadir}/pixmaps/echolinux_48x48.png
%{_datadir}/applications/%{name}.desktop


%changelog
* Fri Mar 13 2009 Lucian Langa <cooly at gnome.eu.org> - 0.17a-4
- license tag fix
- fix compiler flags

* Thu Mar 12 2009 Lucian Langa <cooly at gnome.eu.org> - 0.17a-3
- include correct file for tarball generation

* Thu Dec 11 2008 Lucian Langa <cooly at gnome.eu.org> - 0.17a-2
- remove gsm.h and libgsm.a (license issue)

* Sun Sep 14 2008 Lucian Langa <cooly at gnome.eu.org> - 0.17a-1
- initial specfile




--- NEW FILE generate-echolinux-tarball.sh ---
#!/bin/sh

VERSION=$1

tar -xzvf echolinux-$VERSION.tgz
rm echolinux-$VERSION/echolinux/gsm.h
rm echolinux-$VERSION/echolinux/libgsm.a

tar -czvf echolinux-$VERSION-nogsm.tar.gz echolinux-$VERSION




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/echolinux/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2009 03:38:22 -0000	1.1
+++ .cvsignore	19 Mar 2009 05:50:08 -0000	1.2
@@ -0,0 +1 @@
+echolinux-0.17a-nogsm.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/echolinux/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2009 03:38:22 -0000	1.1
+++ sources	19 Mar 2009 05:50:09 -0000	1.2
@@ -0,0 +1 @@
+6bb5ea31ea722cf37a94c234a0bab39d  echolinux-0.17a-nogsm.tar.gz