diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-05-10 22:58:10 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-05-10 22:58:10 +0000 |
| commit | cc75483441ba4241a6b0079e028d7699d99a6b0f (patch) | |
| tree | 07af3321d8e2ad36d8fad169a15674ce7cc4c460 /packaging | |
| parent | 6d2f911bdd077fee9489b1084b960c4e68fc0658 (diff) | |
| download | cups-cc75483441ba4241a6b0079e028d7699d99a6b0f.tar.gz | |
Merge changes from CUPS 1.5svn-r9136.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2180 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/cups.list.in | 3 | ||||
| -rw-r--r-- | packaging/cups.spec.in | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 2870c2503..6abdfe4b3 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -496,9 +496,6 @@ f 0444 root sys $DATADIR/banners/standard data/standard f 0444 root sys $DATADIR/banners/topsecret data/topsecret f 0444 root sys $DATADIR/banners/unclassified data/unclassified -d 0755 root sys $DATADIR/charmaps - -f 0444 root sys $DATADIR/charmaps data/*.txt - d 0755 root sys $DATADIR/charsets - f 0444 root sys $DATADIR/charsets/utf-8 data/utf-8 diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index 978f353f7..7289b570b 100644 --- a/packaging/cups.spec.in +++ b/packaging/cups.spec.in @@ -39,7 +39,7 @@ Release: 0 Epoch: 1 License: GPL Group: System Environment/Daemons -Source: ftp://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.gz +Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 Url: http://www.cups.org Packager: Anonymous <anonymous@foo.com> Vendor: Apple Inc. @@ -216,8 +216,6 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/cups %dir /usr/share/cups/banners /usr/share/cups/banners/* -%dir /usr/share/cups/charmaps -/usr/share/cups/charmaps/* %dir /usr/share/cups/charsets /usr/share/cups/charsets/* %dir /usr/share/cups/data |