Just passed trough adapter

Changed files:
    cups.spec -> 1.2

diff --git a/cups.spec b/cups.spec
index 7c99373d2f086baab70d33d93104056082052f18..eb0168ae2fc9c892e7139579bc92d856ef0aab29 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -4,23 +4,26 @@ Version:      1.1.2
 Release:       1
 Vendor:                PLD
 License:       GPL/LGPL
-Group:         Utilities/System                
+Group:         Applications/System
+Group(de):     Applikationen/System
+Group(pl):     Aplikacje/System
 Source0:       ftp://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
-Patch0:                cups-chown.patch
+Patch0:                %{name}-chown.patch
 URL:           http://www.cups.org/    
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 
 %description 
-CUPS provides a portable printing layer for UNIX®-based 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.  CUPS uses the Internet Printing Protocol
-("IPP") as the basis for managing print jobs and queues. The Line Printer
-Daemon ("LPD") Server Message Block ("SMB"), and AppSocket (a.k.a. JetDirect)
-protocols are also supported with reduced functionality. CUPS adds network
-printer browsing and PostScript Printer Description ("PPD") based printing
-options to support real-world printing under UNIX.  
+CUPS provides a portable printing layer for UNIX®-based 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. CUPS uses
+the Internet Printing Protocol ("IPP") as the basis for managing print
+jobs and queues. The Line Printer Daemon ("LPD") Server Message Block
+("SMB"), and AppSocket (a.k.a. JetDirect) protocols are also supported
+with reduced functionality. CUPS adds network printer browsing and
+PostScript Printer Description ("PPD") based printing options to
+support real-world printing under UNIX.
 
 %prep
 %setup -q
@@ -33,20 +36,20 @@ autoconf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make    prefix=$RPM_BUILD_ROOT \
-        exec_prefix=$RPM_BUILD_ROOT/usr \
-        BINDIR=$RPM_BUILD_ROOT/usr/bin \
-        DATADIR=$RPM_BUILD_ROOT/usr/share/cups \
-        DOCDIR=$RPM_BUILD_ROOT/usr/share/doc/cups \
-        INCLUDEDIR=$RPM_BUILD_ROOT/usr/include \
-        LIBDIR=$RPM_BUILD_ROOT/usr/lib \
-        LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale \
-        MANDIR=$RPM_BUILD_ROOT/usr/man \
+%{__make}    prefix=$RPM_BUILD_ROOT \
+exec_prefix=$RPM_BUILD_ROOT%{_prefix} \
+        BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+        DATADIR=$RPM_BUILD_ROOT%{_datadir}/cups \
+        DOCDIR=$RPM_BUILD_ROOT%{_datadir}/doc/cups \
+        INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} \
+        LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+        LOCALEDIR=$RPM_BUILD_ROOT%{_datadir}/locale \
+MANDIR=$RPM_BUILD_ROOT%{_prefix}/man \
         PAMDIR=$RPM_BUILD_ROOT/etc/pam.d \
         REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
-        SBINDIR=$RPM_BUILD_ROOT/usr/sbin \
-        SERVERBIN=$RPM_BUILD_ROOT/usr/lib/cups \
-        SERVERROOT=$RPM_BUILD_ROOT/etc/cups \
+SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \
+        SERVERBIN=$RPM_BUILD_ROOT%{_libdir}/cups \
+SERVERROOT=$RPM_BUILD_ROOT%{_sysconfdir}/cups \
         install