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

........

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


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@141746 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 0 insertions, 160 deletions

diff --git a/Makefile b/Makefile
index 6570bde13..a874a7c1a 100644
--- a/Makefile
+++ b/Makefile
@@ -267,9 +267,6 @@ ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
 
 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 @@ webvmail:
 	@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 - 
diff --git a/redhat/asterisk.spec b/redhat/asterisk.spec
deleted file mode 100644
index 4f4ab892c..000000000
--- a/redhat/asterisk.spec
+++ /dev/null
@@ -1,137 +0,0 @@
-Summary: Asterisk PBX
-Name: asterisk
-Distribution: RedHat
-Version: CVS
-Release: 1
-Copyright: Linux Support Services, inc.
-Group: Utilities/System
-Vendor: Linux Support Services, inc.
-Packager: Robert Vojta <vojta@ipex.cz>
-BuildRoot: /tmp/asterisk
-
-%description
-Asterisk is an Open Source PBX and telephony development platform that
-can both replace a conventional PBX and act as a platform for developing
-custom telephony applications for delivering dynamic content over a
-telephone similarly to how one can deliver dynamic content through a
-web browser using CGI and a web server.
-
-Asterisk talks to a variety of telephony hardware including BRI, PRI, 
-POTS, and IP telephony clients using the Inter-Asterisk eXchange
-protocol (e.g. gnophone or miniphone).  For more information and a
-current list of supported hardware, see www.asteriskpbx.com.
-
-%package        devel
-Summary:        Header files for building Asterisk modules
-Group:          Development/Libraries
-
-%description devel
-This package contains the development  header files that are needed
-to compile 3rd party modules.
-
-%post
-ln -sf /var/spool/asterisk/vm /var/lib/asterisk/sounds/vm
-
-%files
-#
-# Configuration files
-#
-%attr(0755,root,root) %dir    /etc/asterisk
-%config(noreplace) %attr(0640,root,root) /etc/asterisk/*.conf
-%config(noreplace) %attr(0640,root,root) /etc/asterisk/*.adsi
-%config(noreplace) %attr(0640,root,root) /etc/asterisk/extensions.ael
-
-#
-# RedHat specific init script file
-#
-%attr(0755,root,root)       /etc/rc.d/init.d/asterisk
-
-#
-# Modules
-#
-%attr(0755,root,root) %dir /usr/lib/asterisk
-%attr(0755,root,root) %dir /usr/lib/asterisk/modules
-%attr(0755,root,root)      /usr/lib/asterisk/modules/*.so
-
-#
-# Asterisk
-#
-%attr(0755,root,root)      /usr/sbin/asterisk
-%attr(0755,root,root)      /usr/sbin/safe_asterisk
-%attr(0755,root,root)      /usr/sbin/astgenkey
-%attr(0755,root,root)      /usr/sbin/astman
-%attr(0755,root,root)      /usr/sbin/autosupport
-%attr(0755,root,root)      /usr/sbin/smsq
-%attr(0755,root,root)      /usr/sbin/stereorize
-%attr(0755,root,root)      /usr/sbin/streamplayer
-
-#
-# CDR Locations
-#
-%attr(0755,root,root) %dir /var/log/asterisk
-%attr(0755,root,root) %dir /var/log/asterisk/cdr-csv
-#
-# Running directories
-#
-%attr(0755,root,root) %dir /var/run
-#
-# Sound files
-#
-%attr(0755,root,root) %dir /var/lib/asterisk
-%attr(0755,root,root) %dir /var/lib/asterisk/sounds
-%attr(0644,root,root)      /var/lib/asterisk/sounds/*.gsm
-%attr(0755,root,root) %dir /var/lib/asterisk/sounds/dictate
-%attr(0644,root,root)      /var/lib/asterisk/sounds/dictate/*.gsm
-%attr(0755,root,root) %dir /var/lib/asterisk/sounds/digits
-%attr(0644,root,root)      /var/lib/asterisk/sounds/digits/*.gsm
-%attr(0755,root,root) %dir /var/lib/asterisk/sounds/letters
-%attr(0644,root,root)      /var/lib/asterisk/sounds/letters/*.gsm
-%attr(0755,root,root) %dir /var/lib/asterisk/sounds/phonetic
-%attr(0644,root,root)      /var/lib/asterisk/sounds/phonetic/*.gsm
-%attr(0755,root,root) %dir /var/lib/asterisk/sounds/silence
-%attr(0644,root,root)      /var/lib/asterisk/sounds/silence/*.gsm
-%attr(0755,root,root) %dir /var/lib/asterisk/mohmp3
-%attr(0644,root,root)      /var/lib/asterisk/mohmp3/*
-%attr(0755,root,root) %dir /var/lib/asterisk/images
-%attr(0644,root,root)      /var/lib/asterisk/images/*
-%attr(0755,root,root) %dir /var/lib/asterisk/keys
-%attr(0644,root,root)      /var/lib/asterisk/keys/*
-%attr(0755,root,root) %dir /var/lib/asterisk/agi-bin
-%attr(0755,root,root) %dir /var/lib/asterisk/agi-bin/*
-#
-# Man page
-#
-%attr(0644,root,root)      /usr/share/man/man8/asterisk.8
-%attr(0644,root,root)      /usr/share/man/man8/astgenkey.8
-%attr(0644,root,root)      /usr/share/man/man8/autosupport.8
-%attr(0644,root,root)      /usr/share/man/man8/safe_asterisk.8
-
-#
-# Firmware
-#
-%attr(0755,root,root) %dir /var/lib/asterisk/firmware
-%attr(0755,root,root) %dir /var/lib/asterisk/firmware/iax
-%attr(0755,root,root)      /var/lib/asterisk/firmware/iax/*.bin
-
-#
-# Example voicemail files
-#
-%attr(0755,root,root) %dir /var/spool/asterisk
-%attr(0755,root,root) %dir /var/spool/asterisk/voicemail
-%attr(0755,root,root) %dir /var/spool/asterisk/voicemail/default
-%attr(0755,root,root) %dir /var/spool/asterisk/voicemail/default/1234
-%attr(0755,root,root) %dir /var/spool/asterisk/voicemail/default/1234/INBOX
-%attr(0644,root,root)      /var/spool/asterisk/voicemail/default/1234/*.gsm
-
-#
-# Misc other spool
-#
-%attr(0755,root,root) %dir /var/spool/asterisk/system
-%attr(0755,root,root) %dir /var/spool/asterisk/tmp
-
-%files devel
-#
-# Include files
-#
-%attr(0755,root,root) %dir %{_includedir}/asterisk
-%attr(0644,root,root) %{_includedir}/asterisk/*.h
diff --git a/redhat/rpmmacros b/redhat/rpmmacros
deleted file mode 100644
index fbf2ee3ed..000000000
--- a/redhat/rpmmacros
+++ /dev/null
@@ -1,3 +0,0 @@
-%_tmppath       /tmp/asterisk
-%_topdir        %{_tmppath}/redhat
-%_rpmfilename   %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
diff --git a/redhat/rpmrc b/redhat/rpmrc
deleted file mode 100644
index 88c57d10b..000000000
--- a/redhat/rpmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-#############################################################
-macrofiles:     /usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/macros:/etc/rpm/macros:/etc/rpm/%{_target}/macros:~/.rpmmacros:/tmp/asterisk/rpmmacros
-#############################################################