[asterisk-commits] qwell: branch 1.6.0 r141746 - in /branches/1.6.0: ./ Makefile redhat/

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Sep  8 15:19:29 2008
New Revision: 141746

URL: http://svn.digium.com/view/asterisk?view=rev&rev=141746
Log:
Merged revisions 141745 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r141745 | qwell | 2008-09-08 15:18:17 -0500 (Mon, 08 Sep 2008) | 16 lines

Merged revisions 141741 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r141741 | qwell | 2008-09-08 15:15:42 -0500 (Mon, 08 Sep 2008) | 8 lines

Remove RPM package targets from Makefile (and all associated parts).
This has never worked in 1.4, and we decided that it makes no sense to be done here.
There are many distros out there that already have "proper" spec files that can be (re)used.

Closes issue #13113
Closes issue #10950
Closes issue #10952

........

................

Removed:
    branches/1.6.0/redhat/
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/Makefile?view=diff&rev=141746&r1=141745&r2=141746
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Mon Sep  8 15:19:29 2008
@@ -267,9 +267,6 @@
 
 ifneq ($(wildcard .version),)
   ASTERISKVERSIONNUM:=$(shell $(AWK) -F. '{printf "%01d%02d%02d", $$1, $$2, $$3}' .version)
-  RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
-else
-  RPMVERSION=unknown
 endif
 
 ifneq ($(wildcard .svn),)
@@ -739,20 +736,6 @@
 	@echo " +                                           +"
 	@echo " +-------------------------------------------+"  
 
-spec: 
-	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
-
-rpm: __rpm
-
-__rpm: main/version.c include/asterisk/version.h include/asterisk/buildopts.h spec
-	rm -rf /tmp/asterisk ; \
-	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
-	$(MAKE) DESTDIR=/tmp/asterisk install ; \
-	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
-	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
-	cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
-	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
-
 progdocs:
 	(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
 	echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -