rpms/gmfsk/devel gmfsk-0.7pre1-gcc.patch, NONE, 1.1 gmfsk.desktop, NONE, 1.1 gmfsk.png, NONE, 1.1 gmfsk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Robert 'Bob' Jensen (bjensen) fedora-extras-commits at redhat.com
Sun Mar 2 20:51:25 UTC 2008


Author: bjensen

Update of /cvs/pkgs/rpms/gmfsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10578/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gmfsk-0.7pre1-gcc.patch gmfsk.desktop gmfsk.png gmfsk.spec 
Log Message:

Committing in gmfsk0.7pre1 for devel.

Modified Files:
 	devel/.cvsignore devel/sources 
Added Files:
 	devel/gmfsk-0.7pre1-gcc.patch devel/gmfsk.desktop 
 	devel/gmfsk.png devel/gmfsk.spec 


gmfsk-0.7pre1-gcc.patch:

--- NEW FILE gmfsk-0.7pre1-gcc.patch ---
diff -up gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix gmfsk-0.7pre1/src/olivia/mfsk.h
--- gmfsk-0.7pre1/src/olivia/mfsk.h.gccfix	2005-01-20 14:38:06.000000000 -0600
+++ gmfsk-0.7pre1/src/olivia/mfsk.h	2008-02-28 16:27:08.000000000 -0600
@@ -1448,7 +1448,7 @@ class MFSK_Encoder
    void PrintOutputBlock(void)
      { size_t TimeBit;
        for(TimeBit=0; TimeBit<SymbolsPerBlock; TimeBit++)
-       { printf("%2d: ",TimeBit);
+       { printf("%2zd: ",TimeBit);
 	     PrintBinary(OutputBlock[TimeBit],BitsPerSymbol);
 		 printf("\n"); }
      }
@@ -1604,7 +1604,7 @@ class MFSK_HardDecoder
      { size_t TimeBit;
        size_t Ptr=InputPtr;
        for(TimeBit=0; TimeBit<SymbolsPerBlock; TimeBit++)
-       { printf("%2d: ",TimeBit);
+       { printf("%2zd: ",TimeBit);
 	     PrintBinary(InputBuffer[Ptr],BitsPerSymbol);
 		 printf("\n");
 		 Ptr+=1; Ptr&=InputWrap; }
@@ -1956,11 +1956,11 @@ template <class Type=float>
    MFSK_Encoder Encoder;    // FEC encoder
    size_t SymbolPtr;
 
-   MFSK_Modulator<Type> Modulator; // MFSK modulator
+  MFSK_Modulator<Type> Modulator; // MFSK modulator
 
    Type *ModulatorOutput;
 
-   RateConverter<Type> RateConverter; // output rate converter
+  ::RateConverter<Type> RateConverter; // output rate converter
 
    Type *ConverterOutput;
 
@@ -2209,7 +2209,7 @@ template <class Type=float>
 
   private:
 
-   RateConverter<Type> RateConverter;
+  ::RateConverter<Type> RateConverter;
 
    Seq<Type> InputBuffer;
 


--- NEW FILE gmfsk.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=gmfsk
GenericName=gmfsk
Comment=A Gnome Multimode HF Terminal for Ham Radio
Exec=gmfsk
Icon=gmfsk.png
Terminal=false
Type=Application
Categories=HamRadio;
Version=1.0


--- NEW FILE gmfsk.spec ---
Name:           gmfsk
Version:        0.7
Release:        0.5.pre1%{?dist}
Summary:        A Gnome Multimode HF Terminal for Ham Radio

Group:          Applications/Communications
License:        GPLv2+
URL:            http://gmfsk.connect.fi/
Source0:        http://gmfsk.connect.fi/%{name}-%{version}pre1.tar.gz
#add .desktop file
Source1:        %{name}.desktop
#temporary Icon
Source2:        %{name}.png
Patch0:         gmfsk-0.7pre1-gcc.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  fftw2-devel, GConf2-devel, libgnomeui-devel, hamlib-devel
BuildRequires:  scrollkeeper, gettext, desktop-file-utils
#Requires:       
Requires(pre):  GConf2
Requires(post): GConf2, scrollkeeper
Requires(preun):  GConf2
Requires(postun): scrollkeeper

%description
gmfsk is a terminal program for amateur radio digital communication modes
for GNOME. It supports MFSK, RTTY, THROB, PSK31, MT63 and Hellschreiber
modulations. It is used for keyboard-to-keyboard chatting and not reliable
packet communication.

%prep
%setup -qn %{name}-%{version}pre1
%patch0 -p 1 -b .gccfix
#all files should be utf-8
recode()
{
  iconv -f "$2" -t utf-8 < "$1" > "${1}_"
  mv -f "${1}_" "$1"
}
recode README iso-8859-15

%build
%configure --enable-hamlib
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT

#applications shouldn't install fonts
rm -rf $RPM_BUILD_ROOT%{_datadir}/fonts

# no upstream .desktop or icon
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}/
install -m 644 %{SOURCE2} \
  ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
desktop-file-install --vendor="" \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
  %{SOURCE1}

%find_lang %{name}

%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :

scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi

%postun
scrollkeeper-update -q || :

%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING COPYING-DOCS README TODO
%{_bindir}/*
%{_datadir}/gnome/help/gmfsk
%{_datadir}/omf/gmfsk
%{_datadir}/pixmaps/*
%{_datadir}/applications/*%{name}.desktop
%config(noreplace) %{_sysconfdir}/gconf/schemas/*

%changelog
* Sun Mar 02 2008 Robert 'Bob' Jensen - 0.7-0.5.pre1
- Fix NVR per nirik's request

* Thu Feb 28 2008 Steve Conklin - 0.7-0.pre1.4
- Fix compiler errors
- fixed some desktop file and icon errors

* Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.3
- Add icon file

* Tue Feb 26 2008 Robert 'Bob' Jensen - 0.7-0.pre1.2
- Add .desktop file

* Sun Dec 09 2007 Sindre Pedersen Bjørdal - 0.7-0.pre1.1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gmfsk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Mar 2008 17:13:15 -0000	1.1
+++ .cvsignore	2 Mar 2008 20:50:52 -0000	1.2
@@ -0,0 +1 @@
+gmfsk-0.7pre1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gmfsk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Mar 2008 17:13:15 -0000	1.1
+++ sources	2 Mar 2008 20:50:52 -0000	1.2
@@ -0,0 +1 @@
+62bf63530f67eff2b757e7e46507a275  gmfsk-0.7pre1.tar.gz




More information about the fedora-extras-commits mailing list