X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=cups.spec;h=82fd6f14a0d54c9f1ba6b4736e7aa3415a2696fd;hb=2717f05998ce5da1fa1c2ce6fd4f79d88429dbe1;hp=5301e87be5ef78c53de1b3acafb6babff92d8765;hpb=2973e4494eb57c0e8787d8f89625b11d17710556;p=packages%2Fcups.git

diff --git a/cups.spec b/cups.spec
index 5301e87..82fd6f1 100644
--- a/cups.spec
+++ b/cups.spec
@@ -5,11 +5,8 @@
 #
 # Conditional build:
 %bcond_with	gnutls		# use GNU TLS for SSL/TLS support (instead of OpenSSL)
-%bcond_with	dnssd
 %bcond_without	php		# don't build PHP extension
 %bcond_without	perl		# don't build Perl extension
-%bcond_without	java
-%bcond_without	python
 %bcond_without	static_libs	# don't build static library
 #
 %include	/usr/lib/rpm/macros.perl
@@ -18,13 +15,13 @@ Summary:	Common Unix Printing System
 Summary(pl.UTF-8):	Ogólny system druku dla Uniksa
 Summary(pt_BR.UTF-8):	Sistema Unix de Impressão
 Name:		cups
-Version:	1.3
+Version:	1.2.11
 Release:	0.1
 Epoch:		1
 License:	GPL/LGPL
 Group:		Applications/Printing
-Source0:	http://dl.sourceforge.net/sourceforge/cups/%{name}-%{version}svn-r6309-source.tar.bz2
-# Source0-md5:	c819a5eca9f2434c5f51fd01df00c38d
+Source0:	http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
+# Source0-md5:	2742f1eec38abb04472b86627da8e493
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.logrotate
@@ -36,12 +33,10 @@ Patch3:		%{name}-man_pages_linking.patch
 Patch4:		%{name}-nostrip.patch
 Patch5:		%{name}-templates.patch
 Patch6:		%{name}-certs_FHS.patch
-Patch7:		%{name}-direct_usb.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	glibc-headers
 BuildRequires:	dbus-devel
 %{?with_gnutls:BuildRequires:	gnutls-devel}
 BuildRequires:	libjpeg-devel
@@ -248,28 +243,16 @@ ports.
 Ten pakiet umożliwia drukowanie z poziomu CUPS-a na drukarkach
 podłączonych do portów równoległych.
 
-%package X
-Summary:	for WM
-Summary(pl.UTF-8):	for menu in WM
-Group:          Applications
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-
-%description X
--
-
-%description X -l pl.UTF-8
--
-
 %prep
-%setup -q -n %{name}-%{version}svn-r6309
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+# WHY THIS IS NEEDED?
+#%patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -277,27 +260,15 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 %configure \
 	--libdir=%{_ulibdir} \
 	--enable-shared \
-	--with-cups-user=lp \
-	--with-cups-group=sys \
-	--with-system-groups=sys \
-	--with-printcap=/etc/printcap \
 	%{?with_static_libs:--enable-static} \
 	--enable-ssl \
 	--%{?with_gnutls:dis}%{!?with_gnutls:en}able-openssl \
 	--%{!?with_gnutls:dis}%{?with_gnutls:en}able-gnutls \
-	--%{!?with_dnssd:dis}%{?with_dnssd:en}able-dnssd \
 	--disable-cdsassl \
 	--enable-dbus \
 	%{?debug:--enable-debug} \
 	--with-docdir=%{_ulibdir}/%{name}/cgi-bin \
-	--with-config-file-perm=0640 \
-	--with-log-file-perm=0640 \
-	%{?with_dnssd:--with-dnssd-libs=x} \
-	%{?with_dnssd:--with-dnssd-includes=x} \
-	%{?with_php:--with-php} \
-	%{?with_perl:--with-perl} \
-	%{?with_java:--with-java} \
-	%{?with_php:--with-python}
+	%{?with_php:--with-php}
 
 %{__make}
 
@@ -321,7 +292,7 @@ cd ../..
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,logrotate.d,security} \
 	$RPM_BUILD_ROOT/var/run/cups \
-	$RPM_BUILD_ROOT/var/log/{,archiv/}cups
+	$RPM_BUILD_ROOT/var/log/{,archive/}cups
 
 %{__make} install \
 	BUILDROOT=$RPM_BUILD_ROOT \
@@ -448,6 +419,7 @@ fi
 %lang(ja) %{_ulibdir}/cups/cgi-bin/ja
 %lang(pl) %{_ulibdir}/cups/cgi-bin/pl
 %lang(sv) %{_ulibdir}/cups/cgi-bin/sv
+%lang(zh_TW) %{_ulibdir}/cups/cgi-bin/zh_TW
 
 %exclude %{_ulibdir}/cups/backend/usb
 %exclude %{_ulibdir}/cups/backend/serial
@@ -486,6 +458,7 @@ fi
 %lang(ja) %{_datadir}/cups/templates/ja
 %lang(pl) %{_datadir}/cups/templates/pl
 %lang(sv) %{_datadir}/cups/templates/sv
+%lang(zh_TW) %{_datadir}/cups/templates/zh_TW
 %{_mandir}/man7/backend.7*
 %{_mandir}/man1/cupstestppd.1*
 %{_mandir}/man1/cupstestdsc.1*
@@ -500,6 +473,7 @@ fi
 %lang(ja) %{_datadir}/locale/ja/cups_ja.po
 %lang(pl) %{_datadir}/locale/pl/cups_pl.po
 %lang(sv) %{_datadir}/locale/sv/cups_sv.po
+%lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po
 
 %dir %attr(775,root,lp) /var/cache/cups
 %dir %attr(755,root,lp) /var/lib/cups
@@ -511,7 +485,7 @@ fi
 %attr(640,root,lp) %ghost /var/cache/cups/job.cache
 %attr(600,lp,lp) %ghost /var/cache/cups/ppds.dat
 %attr(640,root,lp) %ghost /var/cache/cups/remote.cache
-%attr(750,root,logs) %dir /var/log/archiv/cups
+%attr(750,root,logs) %dir /var/log/archive/cups
 %attr(750,root,logs) %dir /var/log/cups
 %attr(640,root,logs) %ghost /var/log/cups/access_log
 %attr(640,root,logs) %ghost /var/log/cups/error_log
@@ -613,8 +587,3 @@ fi
 %files backend-parallel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_ulibdir}/cups/backend/parallel
-
-%files X
-%defattr(644,root,root,755)
-%{_desktopdir}/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png