diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-26 19:37:04 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-26 19:37:04 +0000 |
| commit | c41769ffd04ad45bb2c95691ad3999674896a2ed (patch) | |
| tree | 550981cc16f46b17c991aaab2a0c520ba1333f86 /packaging | |
| parent | a469f8a57669e1948d5cc29005d8c097312de63a (diff) | |
| download | cups-c41769ffd04ad45bb2c95691ad3999674896a2ed.tar.gz | |
Merge changes from CUPS 1.7svn-r10710.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4040 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/cups.list.in | 2 | ||||
| -rw-r--r-- | packaging/cups.spec.in | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/packaging/cups.list.in b/packaging/cups.list.in index e915037e0..0c4ba904c 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -528,6 +528,8 @@ d 0755 root $CUPS_GROUP $SERVERROOT - d 0755 root $CUPS_GROUP $SERVERROOT/interfaces - d 0755 root $CUPS_GROUP $SERVERROOT/ppd - d 0700 root $CUPS_GROUP $SERVERROOT/ssl - +c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cups-files.conf conf/cups-files.conf +f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cups-files.conf.default conf/cups-files.conf c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf conf/cupsd.conf f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/snmp.conf conf/snmp.conf diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index b3576e850..4ff0a7ed6 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -135,6 +135,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /etc/cups %config(noreplace) /etc/cups/*.conf +/etc/cups/cups-files.conf.default /etc/cups/cupsd.conf.default %dir /etc/cups/interfaces %dir /etc/cups/ppd |