Author: glen Date: Sat Mar 3 15:29:41 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- revert 1.3 on HEAD (moved to DEVEL)
---- Files affected:
SPECS:
cups.spec (1.192 -> 1.193)
---- Diffs:
================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.192 SPECS/cups.spec:1.193
--- SPECS/cups.spec:1.192 Sat Mar 3 16:04:18 2007
+++ SPECS/cups.spec Sat Mar 3 16:29:35 2007
@@ -6,28 +6,23 @@
#
# 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
%define pdir CUPS
-%define _svn r6309
-%define _rel 0.1
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
-Release: 0.%{svn}.%{_rel}
+Version: 1.2.8
+Release: 2
Epoch: 1
License: GPL/LGPL
Group: Applications/Printing
-Source0:
http://dl.sourceforge.net/cups/%{name}-%{version}svn-%{_svn}-source.tar.bz2
-# Source0-md5: c819a5eca9f2434c5f51fd01df00c38d
+Source0:
http://ftp.easysw.com/pub/cups/%{version}/%{name}-%{version}-source.tar.bz2
+# Source0-md5: d2cc0604113d5300b7b3e823b660d04a
Source1: %{name}.init
Source2: %{name}.pamd
Source3: %{name}.logrotate
@@ -45,7 +40,6 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: dbus-devel
-BuildRequires: glibc-headers
%{?with_gnutls:BuildRequires: gnutls-devel}
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -252,7 +246,7 @@
podłączonych do portów równoległych.
%prep
-%setup -q -n %{name}-%{version}svn-%{_svn}
+%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -268,27 +262,15 @@
%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}
@@ -611,15 +593,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.192 2007/03/03 15:04:18 glen
-- move crapo removal
-
-Revision 1.191 2007/03/03 15:02:28 glen
-- adapter, remove crapola
-- it is not 1.3 release but svn snapshot (denote it in release and changelog)
-
-Revision 1.190 2007/03/03 14:36:45 wolvverine
-- up to 1.3 snapshot (svn r6309)
+Revision 1.193 2007/03/03 15:29:35 glen
+- revert 1.3 on HEAD (moved to DEVEL)
Revision 1.189 2007/02/22 18:09:29 wolvverine
- add mailto.conf file
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/cups.spec?r1=1.192&r2=1.193&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
