- rewrited for 1.1.9

Changed files:
    cups.spec -> 1.9

diff --git a/cups.spec b/cups.spec
index 126c09b0c944f893121e552809e8b3a6128bfe8e..009bdb4b6106b88a0ee2185010b570ca39370095 100644 (file)
--- a/cups.spec
+++ b/cups.spec
@@ -1,19 +1,22 @@
 Summary:       Common Unix Printing System     
 Summary(pl):   Popularny System Druku dla Unixa
 Name:          cups
-Version:       1.1.6
+Version:       1.1.9
 Release:       1
 License:       GPL/LGPL
 Group:         Applications/System
 Group(de):     Applikationen/System
 Group(pl):     Aplikacje/System
-Source0:       ftp://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-source.tar.bz2
+Source0:       ftp://ftp.easysw.com/pub/%{name}/%{version}/%{name}-%{version}-1-source.tar.bz2
 Source1:       %{name}.init
+Source2:       %{name}.pamd
+Patch0:                %{name}-DESTDIR.patch
 BuildRequires: openssl-devel
 BuildRequires: pam-devel
 BuildRequires: zlib-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
+Requires:      %{name}-libs = %{version}
 URL:           http://www.cups.org/    
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,6 +38,13 @@ CUPS dostarcza standardowy poziom drukowania dla system
 na UNIXie. CUPS u¿ywa protoko³u IPP - Internet Printint Protocol
 jako podstawy do zarz±dzania zadaniami i kolejkami druku.
 
+%package libs
+Summary:       Common Unix Printing System Libraries
+Group:         Development/Libraries
+
+%description libs
+Common Unix Printing System Libraries
+
 %package devel
 Summary:       Common Unix Printing System development files
 Summary(pl):   Popularny System Druku dla Unixa, pliki nag³ówkowe
@@ -42,7 +52,7 @@ Group:                Development/Libraries
 Group(de):     Entwicklung/Libraries
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
-Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{version}
 
 %description devel
 Common Unix Printing System development files
@@ -67,82 +77,86 @@ Popularny System Druku dla Unixa, biblioteki statyczne
  
 %prep
 %setup -q
-
+%patch0 -p1
 %build
+aclocal
+autoconf
 %configure
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT
-
-%{__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%{_mandir} \
-       PAMDIR=$RPM_BUILD_ROOT/etc/pam.d \
-        REQUESTS=$RPM_BUILD_ROOT/var/spool/cups \
-       SBINDIR=$RPM_BUILD_ROOT%{_sbindir} \
-        SERVERBIN=$RPM_BUILD_ROOT%{_libdir}/cups \
-       SERVERROOT=$RPM_BUILD_ROOT%{_sysconfdir}/cups \
-    install 
-
-install -d $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/cups
-
-%find_lang %{name}
+
+%{__make} DESTDIR=$RPM_BUILD_ROOT install 
+
+install -d             $RPM_BUILD_ROOT/%{_sysconfdir}/{rc.d/init.d,pam.d}
+install %{SOURCE1}     $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/cups
+install %{SOURCE2}     $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/cups
 
 gzip -9nf *.txt
 
 %post
 /sbin/chkconfig --add cups
-    
+if [ -f /var/lock/subsys/cups ]; then
+        /etc/rc.d/init.d/cups restart 1>&2
+else
+        echo "Run \"/etc/rc.d/init.d/cups start\" to start cups daemon."
+fi
+               
 %preun
-/sbin/chkconfig --del cups
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/cups ]; then
+               /etc/rc.d/init.d/cups stop 1>&2
+       fi
+       /sbin/chkconfig --del cups
+fi
 
 %clean
 rm -f $RPM_BUILD_ROOT
 
-%files  -f %{name}.lang
+%files
 %defattr(644,root,root,755)
-%doc *.gz
-%attr(755,root,root) %{_bindir}
-%attr(755,root,root) %{_libdir}/lib*.so*
-%attr(755,root,root) %{_libdir}/accept
-%attr(755,root,root) %{_libdir}/lpadmin
-%attr(755,root,root) %{_libdir}/lpmove
-%attr(755,root,root) %{_libdir}/reject
+%doc *.gz doc/*.html doc/*.css doc/*.pdf doc/images
+%attr(4755,lp,root) %{_bindir}/lppasswd
+%attr(755,root,root) %{_bindir}/cancel
+%attr(755,root,root) %{_bindir}/disable
+%attr(755,root,root) %{_bindir}/enable
+%attr(755,root,root) %{_bindir}/lp
+%attr(755,root,root) %{_bindir}/lpoptions
+%attr(755,root,root) %{_bindir}/lpq
+%attr(755,root,root) %{_bindir}/lpr
+%attr(755,root,root) %{_bindir}/lprm
+%attr(755,root,root) %{_bindir}/lpstat
 %attr(755,root,root) %{_libdir}/cups
-%attr(755,root,root) %{_sbindir}
+%attr(755,root,root) %{_sbindir}/*
+%attr(640,root,root) %config %verify(not size mtime md5) %{_sysconfdir}/pam.d/*
+%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/cups
+%attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/cups/*.conf
+%attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/cups/*.convs
+%attr(640,root,lp) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/cups/*.types
+%{_sysconfdir}/cups/certs
+%{_sysconfdir}/cups/interfaces
+%{_sysconfdir}/cups/ppd
+%{_docdir}/cups
+%{_datadir}/cups
+%{_mandir}/man[158]/*
 %lang(C)  %{_datadir}/locale/C/cups_C
 %lang(de) %{_datadir}/locale/de/cups_de
 %lang(en) %{_datadir}/locale/en/cups_en
 %lang(es) %{_datadir}/locale/es/cups_es
 %lang(fr) %{_datadir}/locale/fr/cups_fr
 %lang(it) %{_datadir}/locale/it/cups_it
-%{_sysconfdir}/pam.d
-%{_sysconfdir}/cups/certs
-%{_sysconfdir}/cups/interfaces
-%{_sysconfdir}/cups/ppd
-%config(noreplace) %{_sysconfdir}/cups/*.conf
-%config(noreplace) %{_sysconfdir}/cups/*.convs
-%config(noreplace) %{_sysconfdir}/cups/*.types
-%{_sysconfdir}/rc.d/init.d/cups
-%{_docdir}/cups
-%{_datadir}/cups
-%{_mandir}/man[158]
 /var/log/cups
 /var/spool/cups
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so*
+
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/cups
+%{_libdir}/lib*.so
 
 %files static
 %defattr(644,root,root,755)