dist-git conversion

#2781)

Makefile

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

ser.spec

@@ -1,15 +1,15 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
-%if "%{fedora}" >= "4"
+%if 0%{?fedora} >= 4
    %define serweb true
 %endif
 
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 13%{?dist}
-License: GPL
+Release: 15%{?dist}
+License: GPLv2+
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
 Source1: ftp://ftp.berlios.de/pub/ser/latest/contrib/serweb-%{serweb_version}.tar.gz
@@ -21,9 +21,10 @@ URL: http://www.iptel.org/ser/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel, bison
 BuildRequires: flex
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Requires(post): chkconfig
+Requires(preun): chkconfig
+# for /sbin/service
+Requires(preun): initscripts
 
 %description
 A high-performance, configurable SIP server. It can act as registrar, proxy
@@ -215,6 +216,14 @@ fi
 %endif
 
 %changelog
+* Mon Jul  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.9.6-15
+- fix conditional comparison
+- fix license tag
+- fix unnecessary file deps
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.6-14
+- Autorebuild for GCC 4.3
+
 * Wed Aug 29 2007 Andreas Thienemann <andreas@bawue.net> 0.9.6-13
 - Fix build issues on non x86 systems for good