dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: redhat-lsb
-# $Id: Makefile,v 1.1 2004/09/09 11:25:19 cvsdist Exp $
-NAME := redhat-lsb
-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),)
-# attempt 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)

redhat-lsb-lsb_start_daemon-fix.patch

@@ -0,0 +1,43 @@
+diff -up redhat-lsb-3.1/lsb_start_daemon.orig redhat-lsb-3.1/lsb_start_daemon
+--- redhat-lsb-3.1/lsb_start_daemon.orig	2009-05-15 11:20:17.000000000 -0400
++++ redhat-lsb-3.1/lsb_start_daemon	2009-05-15 11:33:03.000000000 -0400
+@@ -4,6 +4,9 @@
+ 
+ nice=
+ force=
++pidfile=
++user=
++check=
+ RETVAL=
+ while [ "$1" != "${1##[-+]}" ]; do
+ 	case $1 in
+@@ -15,7 +18,28 @@ while [ "$1" != "${1##[-+]}" ]; do
+ 	     	nice=$2
+ 		shift 2
+ 		;;
++	     -p)
++		pidfile="--pidfile $2"
++		shift 2
++		;;
++	     -u)
++	        user="--user $2"
++		shift 2
++		;;
++	     -c)
++	        check="--check $2"
++		shift 2
++		;;
++	      *)     
++ 		echo "Unknown Option $1"
++ 		echo "Options are:"
++ 		echo "-f" 
++		echo "-p {pidfile}"
++		echo "-n [+/-nicelevel]"
++		echo "-u {user}"
++		echo "-c {base}"
++	        exit 1;;	
+ 	esac
+ done
+-LSB=LSB-1.1 daemon ${force:-} ${nice:-} $*
++LSB=LSB-1.1 daemon ${force:-} ${nice:-} ${pidfile:-} ${user:-} ${check:-} $*
+ exit $?

redhat-lsb.spec

@@ -49,10 +49,11 @@
 Summary: LSB support for Red Hat Linux
 Name: redhat-lsb
 Version: 3.2
-Release: 2.fc10
-URL: http://www.linuxfoundation.org/
+Release: 6%{?dist}.1
+URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Patch0: lsb-release-3.1-update-init-functions.patch
+Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
@@ -85,7 +86,7 @@ Provides: lsb-graphics-%{archname} = %{version}
 Provides: lsb-core-noarch = %{version}
 Provides: lsb-graphics-noarch = %{version}
 
-ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x
 
 %ifarch %{ix86}
 # archLSB IA32 Base Libraries
@@ -525,6 +526,7 @@ installed on the system.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -644,6 +646,25 @@ fi
 #/usr/X11R6/lib/X11/rgb.txt
 
 %changelog
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.2-6.1
+- drop glibc-static as a BR for F-10 package
+
+* Wed Oct 21 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 3.2-6
+- apply fix from bz485367 (thanks to Jon Thomas)
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Apr 24 2009 Jens Petersen <petersen@redhat.com>
+- improve url to LSB WG
+
+* Thu Apr 23 2009 Jens Petersen <petersen@redhat.com> - 3.2-4
+- use dist tag (Debarshi, #496553)
+- update to ix86 (caillon)
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Aug 28 2008 Hao Liu <hliu@redhat.com> 3.2-2
 - Modify "Requires: /usr/bin/mailx" to "Requires: mailx" (Bug #460249)