dist-git conversion

#2781)

Makefile

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

xmlstarlet.spec

@@ -1,6 +1,6 @@
 Name: xmlstarlet
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Command Line XML Toolkit
 Group: Applications/Text
 License: MIT
@@ -30,7 +30,7 @@ commands.
 %build
 autoreconf -i
 %configure
-make
+make %{?_smp_mflags}
 cd $RPM_BUILD_DIR/%{name}-%{version}/doc
 xmlto man xmlstarlet-man.xml
 xmlto html-nochunks xmlstarlet-ug.xml
@@ -39,8 +39,8 @@ xmlto html-nochunks xmlstarlet-ug.xml
 
 %install
 rm -fr %{buildroot}
+make install DESTDIR=$RPM_BUILD_ROOT
 
-%makeinstall
 
 %clean
 rm -fr %{buildroot}
@@ -54,6 +54,9 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Sat Mar 22 2008 Paul W. Frields <stickster@gmail.com> - 1.0.1-5
+- Rebuild to use FORTIFY_SOURCE correctly
+
 * Sat Sep  2 2006 Paul W. Frields <stickster@gmail.com> - 1.0.1-4
 - Bump release for FC6 mass rebuild