Author: glen Date: Sat Apr 22 17:19:43 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- adapter, require rpm-build-tools for installer
---- Files affected:
SPECS:
acroread.spec (1.53 -> 1.54)
---- Diffs:
================================================================
Index: SPECS/acroread.spec
diff -u SPECS/acroread.spec:1.53 SPECS/acroread.spec:1.54
--- SPECS/acroread.spec:1.53 Thu Feb 9 16:36:10 2006
+++ SPECS/acroread.spec Sat Apr 22 19:19:38 2006
@@ -3,18 +3,18 @@
# Conditional build:
%bcond_with license_agreement # generates package
#
+%define base_name acroread
Summary: Acrobat Reader
Summary(pl): Acrobat Reader - czytnik plików PDF
Summary(ru): đŇĎÇŇÁÍÍÁ ÄĚŃ ŢÔĹÎÉŃ ÄĎËŐÍĹÎÔĎ× × ĆĎŇÍÁÔĹ PDF ĎÔ Adobe
Summary(uk): đŇĎÇŇÁÍÁ ÄĚŃ ŢÉÔÁÎÎŃ ÄĎËŐÍĹÎÔŚ× Ő ĆĎŇÍÁÔŚ PDF ×ŚÄ Adobe
-%define base_name acroread
%if %{with license_agreement}
Name: %{base_name}
%else
Name: %{base_name}-installer
%endif
-Version: 7.0.5
%define _rel 1
+Version: 7.0.5
Release: %{_rel}%{?with_license_agreement:wla}
Epoch: 1
License: distribution restricted (http://www.adobe.com/products/acrobat/distribute.html)
@@ -23,7 +23,7 @@
# - distribution on CD requires signing Distribution Agreement (see URL above)
Group: X11/Applications/Graphics
%if %{with license_agreement}
-Source0: http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/enu/AdobeReader_enu-7.0.5-1.i386.tar.gz
+Source0: http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.5/enu/AdobeReader_enu-%{version}-1.i386.tar.gz
%else
Source0: license-installer.sh
%endif
@@ -34,6 +34,8 @@
%if %{with license_agreement}
BuildRequires: rpmbuild(macros) >= 1.236
Requires: openldap-libs >= 2.3
+%else
+Requires: rpm-build-tools
%endif
ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,14 +54,14 @@
%define _noautoreq '^lib.*\.so$' '^lib.*\(VERSION\)$'
%description
-Adobe(R) Reader(R) is free software that lets you view and print
-PDF files (Portable Document Format) on a variety of hardware and
+Adobe(R) Reader(R) is free software that lets you view and print PDF
+files (Portable Document Format) on a variety of hardware and
operating system platforms.
%description -l pl
-Adobe(R) Reader(R) jest darmowym oprogramowaniem umożliwiającym oglądanie
-oraz drukowanie plików PDF (Portable Document Format) na różnych platformach
-sprzętowych oraz różnych systemach operacyjnych.
+Adobe(R) Reader(R) jest darmowym oprogramowaniem umożliwiającym
+oglądanie oraz drukowanie plików PDF (Portable Document Format) na
+różnych platformach sprzętowych oraz różnych systemach operacyjnych.
%description -l ru
đŇĎÇŇÁÍÍÁ ÄĚŃ ŢÔĹÎÉŃ ÄĎËŐÍĹÎÔĎ× × ĆĎŇÍÁÔĹ Portable Document Format
@@ -73,9 +75,9 @@
Summary: PDF plugin for Mozilla compatible browsers
Summary(pl): Wtyczka PDF dla przeglądarek zgodnych Mozilla
Group: X11/Applications
-Prereq: mozilla-embedded
-Requires: %{base_name} = %{epoch}:%{version}
+Requires: %{base_name} = %{epoch}:%{version}-%{release}
Requires: browser-plugins(%{_target_cpu})
+Requires: mozilla-embedded
Obsoletes: mozilla-plugin-acroread
%description plugin
@@ -231,6 +233,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.54 2006/04/22 17:19:38 glen
+- adapter, require rpm-build-tools for installer
+
Revision 1.53 2006/02/09 15:36:10 maciek2w
- updated to 7.0.5; STBR
@@ -282,7 +287,8 @@
- add epoch to requires
Revision 1.40.2.3 2005/01/08 13:59:10 arekm
-- version as 7.0; don't strip *.api (it's still 52MB whether you strip *.api or not); add Legal dir. works now
+- version as 7.0; don't strip *.api (it's still 52MB whether you strip
+ *.api or not); add Legal dir. works now
Revision 1.40.2.2 2005/01/08 03:16:50 ankry
- Epoch: 1 (70 < 5010)
@@ -295,7 +301,7 @@
- rel 2, STBR
Revision 1.39 2004/12/15 23:04:39 adamg
-- we don't want to copy patches that don't exit
+- we don't want to copy patches that don't exist
Revision 1.38 2004/12/15 21:54:41 qboosh
- fixed build, removed obsolete locale patch
@@ -304,7 +310,8 @@
- updated to 5.0.10
Revision 1.36 2004/12/13 12:47:32 ankry
-- check whether to install mozilla plugin, unhode the patch is _not_ commented out, rel. 3
+- check whether to install mozilla plugin, unhode the patch is _not_
+ commented out, rel. 3
Revision 1.35 2004/11/18 03:06:53 ankry
- license-compatoble installer, rel. 2
@@ -316,7 +323,7 @@
- ewh.api cannot be stripped for mozilla plugin to work
Revision 1.32 2004/09/28 11:50:33 gotar
-- commented out locale patch (don't see explanation for it's existence),
+- commented out locale patch (don't see explanation for it's existence),
- updated md5.
Revision 1.31 2004/06/13 19:40:10 arekm
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/acroread.spec?r1=1.53&r2=1.54&f=u