dist-git conversion

#2781)

Makefile

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

xkeycaps.spec

@@ -3,8 +3,8 @@
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	4%{?dist}
-License:	BSD
+Release:	6%{?dist}
+License:	MIT
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
 Source1:	xkeycaps.desktop
@@ -30,6 +30,7 @@ xmodmap to recreate your changes in future sessions.
 
 %build
 xmkmf
+sed -i -e 's/^\(\s*CFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile
 make
 
 %install
@@ -56,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 10 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.46-6
+- fix bugzilla 227229
+
 * Mon Sep 11 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.46-5
 - license isn't BSD-ish, its BSD
 - bump for FC-6