Add notifier dir to top-level makefile and to RPM spec file.

Remove generated cups.spec from repo - we always generate it in
tools/testrpm or in the tarball maker script.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@4835 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/Makefile b/Makefile
index ed47eb8a5349d8c0d2ffbdbe19ec9d87049ea683..ec3625ae9f9c718eb23cbd88a09cd0944a20dc14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ include Makedefs
 #
 
 DIRS   =       cups backend berkeley cgi-bin filter man pdftops \
-               scheduler systemv
+               notifier scheduler systemv
 
 #
 # Make all targets...

diff --git a/configure.in b/configure.in
index 28abb1d4f6f1e90c5dcf58ecf2b2c1c75f592f02..7a9ea1f26c5fd4d13ce16197b28feb4d9304c9dc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,7 +46,7 @@ AC_SUBST(MAKEDEFS)
 
 sinclude(config-scripts/cups-scripting.m4)
 
-AC_OUTPUT(Makedefs packaging/cups.list cups.sh packaging/cups.spec cups-config
+AC_OUTPUT(Makedefs packaging/cups.list cups.sh cups-config
           conf/cupsd.conf conf/pam.std doc/index.html
          templates/edit-config.tmpl)
 

diff --git a/packaging/cups.spec b/packaging/cups.spec
deleted file mode 100644 (file)
index d05229e..0000000
--- a/packaging/cups.spec
+++ /dev/null
@@ -1,275 +0,0 @@
-#
-# "$Id$"
-#
-#   RPM "spec" file for the Common UNIX Printing System (CUPS).
-#
-#   Original version by Jason McMullan <jmcc@ontv.com>.
-#
-#   Copyright 1999-2005 by Easy Software Products, all rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-Summary: Common Unix Printing System
-Name: cups
-Version: 1.2svn
-Release: 0
-Epoch: 1
-License: GPL
-Group: System Environment/Daemons
-Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.gz
-Url: http://www.cups.org
-Packager: Anonymous <anonymous@foo.com>
-Vendor: Easy Software Products
-
-# Use buildroot so as not to disturb the version already installed
-BuildRoot: /tmp/%{name}-root
-
-# Dependencies...
-Requires: %{name}-libs = %{epoch}:%{version}
-Obsoletes: lpd, lpr, LPRng
-Provides: lpd, lpr, LPRng
-
-%package devel
-Summary: Common Unix Printing System - development environment
-Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}
-
-%package libs
-Summary: Common Unix Printing System - shared libraries
-Group: System Environment/Libraries
-Provides: libcups1
-
-%package lpd
-Summary: Common Unix Printing System - LPD support
-Group: System Environment/Daemons
-Requires: %{name} = %{epoch}:%{version} xinetd
-
-%description
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. It has been developed by Easy Software Products 
-to promote a standard printing solution for all UNIX vendors and users. 
-CUPS provides the System V and Berkeley command-line interfaces. 
-
-%description devel
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This is the development package for creating
-additional printer drivers and other CUPS services.
-
-%description libs
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This package contains the CUPS shared libraries.
-
-%description lpd
-The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This package provides LPD client support.
-
-%prep
-%setup
-
-%build
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" ./configure
-
-# If we got this far, all prerequisite libraries must be here.
-make
-
-%install
-# Make sure the RPM_BUILD_ROOT directory exists.
-rm -rf $RPM_BUILD_ROOT
-
-make BUILDROOT=$RPM_BUILD_ROOT install
-
-%post
-ldconfig
-
-if test -x /sbin/chkconfig; then
-       /sbin/chkconfig --add cups
-       /sbin/chkconfig cups on
-fi
-
-# these lines automatically start cupsd after installation; commented out
-# by request...
-#if test -f /sbin/init.d/cups; then
-#      /sbin/init.d/cups start
-#fi
-#if test -f /etc/rc.d/init.d/cups; then
-#      /etc/rc.d/init.d/cups start
-#fi
-#if test -f /etc/init.d/cups; then
-#      /etc/init.d/cups start
-#fi
-
-%preun
-if test -f /sbin/init.d/cups; then
-       /sbin/init.d/cups stop
-fi
-if test -f /etc/rc.d/init.d/cups; then
-       /etc/rc.d/init.d/cups stop
-fi
-if test -f /etc/init.d/cups; then
-       /etc/init.d/cups stop
-fi
-
-if test -x /sbin/chkconfig; then
-       /sbin/chkconfig --del cups
-fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%dir /etc/cups
-%config(noreplace) /etc/cups/*.conf
-%dir /etc/cups/interfaces
-/etc/cups/mime.types
-/etc/cups/mime.convs
-%dir /etc/cups/ppd
-%dir /etc/pam.d
-/etc/pam.d/*
-
-# RC dirs are a pain under Linux...  Uncomment the appropriate ones if you
-# don't use Red Hat or Mandrake...
-
-/etc/init.d/*
-/etc/rc0.d/*
-/etc/rc2.d/*
-/etc/rc3.d/*
-/etc/rc5.d/*
-
-# OLD RedHat/Mandrake
-#/etc/rc.d/init.d/*
-#/etc/rc.d/rc0.d/*
-#/etc/rc.d/rc2.d/*
-#/etc/rc.d/rc3.d/*
-#/etc/rc.d/rc5.d/*
-
-#/sbin/rc.d/*
-#/sbin/rc.d/rc0.d/*
-#/sbin/rc.d/rc2.d/*
-#/sbin/rc.d/rc3.d/*
-#/sbin/rc.d/rc5.d/*
-
-/usr/bin/cancel
-/usr/bin/cupstestppd
-/usr/bin/lp*
-%dir /usr/lib/cups
-%dir /usr/lib/cups/backend
-/usr/lib/cups/backend/*
-%dir /usr/lib/cups/cgi-bin
-/usr/lib/cups/cgi-bin/*
-%dir /usr/lib/cups/daemon
-/usr/lib/cups/daemon/cups-deviced
-/usr/lib/cups/daemon/cups-driverd
-/usr/lib/cups/daemon/cups-polld
-%dir /usr/lib/cups/driver
-%dir /usr/lib/cups/filter
-/usr/lib/cups/filter/*
-
-/usr/sbin/*
-%dir /usr/share/cups
-/usr/share/cups/*
-%dir /usr/share/doc/cups
-/usr/share/doc/cups/*.*
-%dir /usr/share/doc/cups/help
-/usr/share/doc/cups/help/*-reference.html
-%dir /usr/share/doc/cups/images
-/usr/share/doc/cups/images/*
-%dir /usr/share/locale
-/usr/share/locale/*
-
-%dir /usr/share/man/cat1
-/usr/share/man/cat1/cancel.1
-/usr/share/man/cat1/cupstestppd.1
-/usr/share/man/cat1/lp.1
-/usr/share/man/cat1/lpoptions.1
-/usr/share/man/cat1/lppasswd.1
-/usr/share/man/cat1/lpq.1
-/usr/share/man/cat1/lpr.1
-/usr/share/man/cat1/lprm.1
-/usr/share/man/cat1/lpstat.1
-%dir /usr/share/man/cat5
-/usr/share/man/cat5/*
-%dir /usr/share/man/cat8
-/usr/share/man/cat8/*
-%dir /usr/share/man/man1
-/usr/share/man/man1/cancel.1.gz
-/usr/share/man/man1/cupstestppd.1.gz
-/usr/share/man/man1/lp.1.gz
-/usr/share/man/man1/lpoptions.1.gz
-/usr/share/man/man1/lppasswd.1.gz
-/usr/share/man/man1/lpq.1.gz
-/usr/share/man/man1/lpr.1.gz
-/usr/share/man/man1/lprm.1.gz
-/usr/share/man/man1/lpstat.1.gz
-%dir /usr/share/man/man5
-/usr/share/man/man5/*
-%dir /usr/share/man/man8
-/usr/share/man/man8/accept.8.gz
-/usr/share/man/man8/cupsaddsmb.8.gz
-/usr/share/man/man8/cupsd.8.gz
-/usr/share/man/man8/cupsenable.8.gz
-/usr/share/man/man8/cups-polld.8.gz
-/usr/share/man/man8/lpadmin.8.gz
-/usr/share/man/man8/lpc.8.gz
-/usr/share/man/man8/lpinfo.8.gz
-/usr/share/man/man8/lpmove.8.gz
-
-%dir /var/cache/cups
-%dir /var/cache/cups/ppd
-%dir /var/log/cups
-%dir /var/run/cups
-%attr(0711,lp,root) %dir /var/run/cups/certs
-%attr(0700,lp,root) %dir /var/spool/cups
-%attr(1700,lp,root) %dir /var/spool/cups/tmp
-
-%files devel
-%defattr(-,root,root)
-%dir /usr/share/man/cat1
-/usr/share/man/cat1/backend.1
-/usr/share/man/cat1/cups-config.1
-/usr/share/man/cat1/filter.1
-%dir /usr/share/man/man1
-/usr/share/man/man1/backend.1.gz
-/usr/share/man/man1/cups-config.1.gz
-/usr/share/man/man1/filter.1.gz
-
-/usr/bin/cups-config
-%dir /usr/include/cups
-/usr/include/cups/*
-/usr/lib/*.a
-/usr/lib/*.so
-
-%dir /usr/share/doc/cups/help
-/usr/share/doc/cups/help/api*.html
-
-%files libs
-%defattr(-,root,root)
-/usr/lib/*.so.*
-
-%files lpd
-%defattr(-,root,root)
-#/etc/xinetd.d/cups-lpd
-%dir /usr/lib/cups
-%dir /usr/lib/cups/daemon
-/usr/lib/cups/daemon/cups-lpd
-%dir /usr/share/man/man8
-/usr/share/man/man8/cups-lpd.8.gz
-
-#
-# End of "$Id$".
-#

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index d2a2b853d8b7889b80802ef7248d7035333b3e11..77c7eab6d2c8b451cc1759b1bb1dcc3a149b0748 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -179,6 +179,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/cups/driver
 %dir /usr/lib/cups/filter
 /usr/lib/cups/filter/*
+%dir /usr/lib/cups/notifier
+/usr/lib/cups/notifier/*
 
 /usr/sbin/*
 %dir /usr/share/cups