update to latest upstream

This commit is contained in:
Lucian Langa 2015-03-22 22:53:49 +01:00
parent 4cd46159f3
commit ef09191500
3 changed files with 20 additions and 37 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
unixcw-2.3.tgz
/unixcw-3.4.1.tar.gz

View File

@ -1 +1 @@
f02e81ab719caa039c85615331c8860b unixcw-2.3.tgz
3beb91aa065ad1fcf4ca87dd4ca7c90f unixcw-3.4.1.tar.gz

View File

@ -1,22 +1,15 @@
Name: unixcw
Version: 2.3
Release: 11%{?dist}
Version: 3.4.1
Release: 1%{?dist}
Summary: Shared library for Morse programs
Group: Applications/Communications
License: GPLv2+
URL: ftp://sunsite.unc.edu/pub/Linux/apps/ham/morse/
Source0: ftp://sunsite.unc.edu/pub/Linux/apps/ham/morse/%{name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://unixcw.sourceforge.net
Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# add DESTDIR to makefile
Patch0: unixcw-2.3-makefile.in.patch
# Link against a qt library that actually exists.
Patch1: unixcw-2.3-qtfix.patch
# x86_64 needs -fPIC to make shared libs, fix configure test to use it.
Patch2: unixcw-2.3-picflag.patch
#BuildRequires:
#Requires:
BuildRequires: ncurses-devel, alsa-lib-devel, pulseaudio-libs-devel, qt4-devel
#Requires:
%description
The UnixCW utilities add a general purpose CW library to your system, and
@ -34,21 +27,11 @@ UnixCW utility libraries.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
# Fix the encoding on the man pages to be UTF-8
recode()
{
iconv -f "$2" -t utf-8 < "$1" > "${1}_"
mv -f "${1}_" "$1"
}
recode src/cwlib/cw.7 iso-8859-2
recode src/cw/cw.1 iso-8859-2
%build
%configure
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
%install
@ -57,33 +40,32 @@ make install DESTDIR=$RPM_BUILD_ROOT
# Get rid of static lib.
rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
#Fix permissions for binary files
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/*
%clean
rm -rf $RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_bindir}/*
%{_libdir}/libcw.so.0
%{_libdir}/libcw.so.0.0.0
%{_libdir}/libcw.so.*
%{_mandir}/man?/*
%files devel
%defattr(-,root,root,-)
%doc README
%{_libdir}/libcw.so
%{_includedir}/*.h
%{_libdir}/pkgconfig/*.pc
%changelog
* Sat Mar 21 2015 Lucian Langa <lucilanga@gnome.eu.org> - 3.4.1-1
- various cleanups
- fix build requires
- drop all patches - fixed upstream
- drop utf8 encoding - fixed upstream
- sync with latest upstream
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild