dist-git conversion

.gitignore

@@ -0,0 +1 @@
+twlog-2.7.src.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: twlog
-# $Id$
-NAME := twlog
-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)

sources

@@ -0,0 +1 @@
+89c3ba7a3650a8cb118935595fe264ce  twlog-2.7.src.tar.gz

twlog-2.7.configure.patch

@@ -0,0 +1,13 @@
+diff -up ./configure.diff ./configure
+--- ./configure.diff	2010-06-19 15:16:52.000000000 -0400
++++ ./configure	2010-07-19 17:23:50.698318130 -0400
+@@ -5805,7 +5805,9 @@ then
+    tw_save_LDFLAGS="$LDFLAGS"
+    for i in                          \
+       /usr/lib                       \
++      /usr/lib64                     \
+       /usr/lib/X11                   \
++      /usr/lib64/X11                 \
+       /usr/X11R6/lib                 \
+       /usr/X11/lib
+    do

twlog-2.7.desktop.patch

@@ -0,0 +1,19 @@
+diff -up ./twlog.desktop.old ./twlog.desktop
+--- ./twlog.desktop.old	2008-01-29 14:33:47.000000000 -0500
++++ ./twlog.desktop	2010-07-17 16:02:18.246326198 -0400
+@@ -1,10 +1,10 @@
+ [Desktop Entry]
+ Name=twlog
+-Name[en_US]=twlog
+-Comment=A logging program for Ham Operators
+-Comment[en_US]=A logging program for Ham Operators
++GenericName=twlog
++Comment=A logging program for Ham Radio Operators
+ Exec=twlog
+-Icon=twlog.png
++Icon=twlog
+ Terminal=false
+ Type=Application
+-Categories=Hamradio
++Categories=Network;HamRadio;
++Version=1.0

twlog-2.7.makefiles.patch

@@ -0,0 +1,26 @@
+diff -up ./Makefile.am.orig ./Makefile.am
+--- ./Makefile.am.orig	2008-02-01 00:58:06.000000000 -0500
++++ ./Makefile.am	2010-07-17 15:55:51.848322673 -0400
+@@ -22,9 +22,6 @@ install-data-local:
+ 	$(INSTALL) -d $(DESTDIR)@APP_DEFAULTS_PATH@
+ 	$(INSTALL_DATA) src/Twlog $(DESTDIR)@APP_DEFAULTS_PATH@
+ 
+-	$(INSTALL) -d $(DESTDIR)@docdir@
+-	$(INSTALL_DATA) THANKS ChangeLog README $(DESTDIR)@docdir@
+-
+ uninstall-local:
+ 	echo "Removing $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog"
+ 	rm -rf $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog
+diff -up ./Makefile.in.orig ./Makefile.in
+--- ./Makefile.in.orig	2010-07-05 17:39:07.000000000 -0400
++++ ./Makefile.in	2010-07-17 15:55:36.780322815 -0400
+@@ -778,9 +778,6 @@ install-data-local:
+ 	$(INSTALL) -d $(DESTDIR)@APP_DEFAULTS_PATH@
+ 	$(INSTALL_DATA) src/Twlog $(DESTDIR)@APP_DEFAULTS_PATH@
+ 
+-	$(INSTALL) -d $(DESTDIR)@docdir@
+-	$(INSTALL_DATA) THANKS ChangeLog README $(DESTDIR)@docdir@
+-
+ uninstall-local:
+ 	echo "Removing $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog"
+ 	rm -rf $(DESTDIR)@APP_DEFAULTS_PATH@/Twlog

twlog.sh.in

@@ -0,0 +1,41 @@
+#!/bin/sh
+# *****************************************************************************
+#               twlog.sh.in  -  Install wrapper script for twlog
+#                            -------------------
+#    begin                : July  12 2010
+#    copyright            : (C) 2010 by Randall J. Berry N3LRX
+#    email                : dp67@fedoraproject.org
+# *****************************************************************************
+# *****************************************************************************
+# *                                                                           *
+# *  This program is free software; you can redistribute it and/or modify     *
+# *  it under the terms of the GNU General Public License as published by     *
+# *  the Free Software Foundation; either GPL version 2 of the License, or    *
+# *  (at your option) any later version.                                      *
+# *                                                                           *
+# *  This program is distributed in the hope that it will be useful,          *
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of           *
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             *
+# *  GNU General Public License for more details.                             *
+# *                                                                           *
+# *  You should have received a copy of the GNU General Public License        *
+# *  along with this program; if not, write to the Free Software              *
+# *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA  *
+# *                                                                           *
+# *****************************************************************************
+
+# Wrapper script for twlog to ensure that configuration is present
+twlogbin="/usr/libexec/twlog-bin"
+# Check if user configuration is present
+# Removed log directory, twlog already checks and if not installed it installs.
+# if [ ! -e ~/.twlogDir ]
+# then
+# mkdir ~/.twlogDir
+# fi
+# Check if config file is present, if not copy user config file to ~/. If present ignore.
+if [ ! -e ~/Twlog ]
+then
+cp /usr/share/X11/app-defaults/Twlog ~/Twlog
+fi
+# Launch twlog
+$twlogbin

twlog.spec

@@ -0,0 +1,94 @@
+Name:		twlog
+Version:	2.7
+Release:	2%{?dist}
+Summary:	Records basic ham radio log information
+Group:		Applications/Communications
+License:	GPLv2+
+URL:		http://wa0eir.home.mchsi.com/%{name}.html
+# .desktop patch
+Patch0:		%{name}-%{version}.desktop.patch
+# Makefile patch
+Patch1:		%{name}-%{version}.makefiles.patch
+# configure patch
+Patch2:		%{name}-%{version}.configure.patch
+Source0:	http://wa0eir.home.mchsi.com/src/%{name}-%{version}.src.tar.gz
+# Wrapper script to install user defaults
+Source1:	%{name}.sh.in
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	xbae-devel
+BuildRequires:	desktop-file-utils
+
+%description
+Twlog records basic Ham log information. It was written
+for day to day logging, not contesting. There are no dupe
+checks or contest related features.
+
+%prep
+%setup -q
+%patch0 -p1 -b %{name}-%{version}.desktop.patch
+%patch1 -p1 -b %{name}-%{version}.makefiles.patch
+%patch2 -p1 -b %{name}-%{version}.configure.patch
+
+# Set perms on source file
+chmod 644 ./src/adif.c
+
+%build
+%configure
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+# Install provided icon
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+install -p -D -m 0644 ./src/icons/%{name}_14x32.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png
+
+desktop-file-install \
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications/	\
+	$RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+
+# Move original binary to libexecdir
+mkdir -p $RPM_BUILD_ROOT/%{_libexecdir}/
+mv $RPM_BUILD_ROOT/%{_bindir}/%{name} $RPM_BUILD_ROOT/%{_libexecdir}/%{name}-bin
+
+# Install wrapper script installs needed files in users home directory.
+install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/%{name}
+
+# Twlog default settings
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/
+install -p -D -m 0644 ./src/Twlog $RPM_BUILD_ROOT/%{_datadir}/X11/app-defaults/Twlog
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING NEWS README TODO ChangeLog THANKS
+%{_bindir}/%{name}
+%{_libexecdir}/%{name}-bin
+%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/X11/app-defaults/Twlog
+%{_datadir}/applications/%{name}.desktop
+
+%changelog
+* Mon Jul 19 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.7-2
+- Apply configure patch to search proper library directories on x86_64
+
+* Sat Jul 17 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.7-1
+- New upstream release
+- Edit spec per review
+- Added desktop-file-install to verify .desktop file
+
+* Thu Jul 15 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.6-3
+- Tweek install wrapper
+- Twlog already checks for log directory. Creates it if not exists.
+- Commented routine from wrapper.
+
+* Mon Jul 12 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.6-2
+- Tweek install wrapper
+
+* Mon Jul 12 2010 Randall "Randy" Berry, N3LRX <dp67@fedoraprojecct.org> - 2.6-1
+- Initial spec build