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 83c7ec0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xlog -# $Id$ -NAME := xlog -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 -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/xlog.spec b/xlog.spec index 156bd1a..8756dbe 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -26,7 +26,7 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files. %setup -q #fix bogus .desktop file sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop -sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio;/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop +sed -i -e "s/Utility;Database;HamRadio;GTK/Network;HamRadio;GTK/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop %build @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 25 2009 Lucian Langa - 2.0.3-3 +- fix desktop file #530845 + * Mon Jul 27 2009 Fedora Release Engineering - 2.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild