From 65fdc2885e4b02867ee55aa0d0098e508d6b53d3 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 15 Jan 2009 20:46:00 +0000 Subject: [PATCH 1/4] Initialize branch F-10 for wxapt --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..dc32377 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-10 From 9400115289ea8a24ee8d64ee1a0878e631bd2067 Mon Sep 17 00:00:00 2001 From: Randall 'Randy' Berry Date: Fri, 16 Jan 2009 04:03:34 +0000 Subject: [PATCH 2/4] Second build F10 --- .cvsignore | 1 + sources | 1 + wxapt.makefile.patch | 35 +++++++++++++++++++++++++ wxapt.spec | 61 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 wxapt.makefile.patch create mode 100644 wxapt.spec diff --git a/.cvsignore b/.cvsignore index e69de29..00440ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wxapt-1.3.tar.gz diff --git a/sources b/sources index e69de29..dc03835 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +04bc342743af558cd7f95c62ce4a84bc wxapt-1.3.tar.gz diff --git a/wxapt.makefile.patch b/wxapt.makefile.patch new file mode 100644 index 0000000..36ad3d9 --- /dev/null +++ b/wxapt.makefile.patch @@ -0,0 +1,35 @@ +diff -up wxapt/Makefile.orig wxapt/Makefile +--- wxapt/Makefile.orig 2007-11-23 02:18:31.000000000 -0500 ++++ wxapt/Makefile 2009-01-14 10:29:28.000000000 -0500 +@@ -2,10 +2,12 @@ + + SHELL = /bin/sh + PROJECT = wxapt +-BINDIR = /usr/local/bin +-DOCDIR = /usr/local/share/doc/ ++BINDIR = /usr/bin ++DOCDIR = /usr/share/doc/ + CC = gcc -Wall -O2 -march=native + ++DESTDIR= ++ + objects = image.o sound.o wxapt.o + + $(PROJECT) : $(objects) +@@ -14,13 +16,10 @@ $(PROJECT) : $(objects) + $(objects) : $(PROJECT).h + + install : $(PROJECT) +- install -m 755 --strip $(PROJECT) $(BINDIR) +- install -m 644 doc/$(PROJECT).html $(DOCDIR) +- ++ install -D -m 755 $(PROJECT) $(DESTDIR)$(BINDIR)/$(PROJECT) + uninstall : +- rm $(BINDIR)/$(PROJECT) +- rm $(DOCDIR)/$(PROJECT).html +- ++ rm $(DESTDIR)$(BINDIR)/$(PROJECT) ++ rm $(DESTDIR)$(DOCDIR)/$(PROJECT).html + clean : + rm -f *.o *~ + diff --git a/wxapt.spec b/wxapt.spec new file mode 100644 index 0000000..1510db4 --- /dev/null +++ b/wxapt.spec @@ -0,0 +1,61 @@ +Name: wxapt +Version: 1.3 +Release: 3%{?dist} +Summary: Console application for decoding and saving weather images + +Group: Applications/Communications +License: GPLv2+ +URL: http://5b4az.chronos.org.uk/pages/apt.html +Source0: http://5b4az.chronos.org.uk/pkg/apt/wxapt/%{name}-%{version}.tar.gz +Patch0: wxapt.makefile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: ncurses-devel +#Requires: +#ExcludeArch: PPC +#ExcludeArch: PPC64 + +%description +wxapt is a console application for decoding and saving weather images +transmitted in the APT format of NOAA and METEOR satellites. + +%prep +%setup -qn %{name} +%patch0 -p1 -b makefile.patch +#fix CFLAG from upstream +sed -i -e 's/-march=native//g' Makefile + +%build +make CFLAGS="%{optflags}" %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +#skip make install and do manual install, it's just one file +install -D -m 0755 wxapt $RPM_BUILD_ROOT%{_bindir}/%{name} +#skip .desktop file as this is a command line application + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS README +%{_bindir}/* + + +%changelog +* Wed Jan 14 2009 Randall J. Berry 'Dp67' 1.3-3 +- Makefile patch change dir from /usr/local to /usr +- Build for ppc and ppc64 previously failed + +* Wed Jan 14 2009 Randall J. Berry 'Dp67' 1.3-2 +- mock build F9/10/devel +- rpmlint 3 packages and 1 specfiles checked; 0 errors, 0 warnings. +- Submit for review + +* Sun Sep 21 2008 Randall J. Berry 'Dp67' 1.3-1 +- Build test for f9 + +* Sun Mar 02 2008 Sindre Pedersen Bjordal - 1.3-1 +- Initial build From d98b8cfffdf6e113f0f0fbb109814c2f4db51607 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:19:28 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dfc35ca..6b64802 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wxapt SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a8d5caadf7a0fde00037f177f4440ea9c6ac9ebd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:29:29 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 6b64802..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wxapt -# $Id$ -NAME := wxapt -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index dc32377..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-10