Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4C613E229 for ; Sat, 8 Dec 2012 16:41:49 +0000 (UTC) Received: (qmail 28943 invoked by uid 500); 8 Dec 2012 16:41:49 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 28739 invoked by uid 500); 8 Dec 2012 16:41:48 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 28716 invoked by uid 99); 8 Dec 2012 16:41:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2012 16:41:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Dec 2012 16:41:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 92CBD238897F; Sat, 8 Dec 2012 16:41:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1418703 - /httpd/httpd/trunk/build/rpm/httpd.spec.in Date: Sat, 08 Dec 2012 16:41:24 -0000 To: cvs@httpd.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121208164124.92CBD238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: minfrin Date: Sat Dec 8 16:41:23 2012 New Revision: 1418703 URL: http://svn.apache.org/viewvc?rev=1418703&view=rev Log: rpm: Remove stray references to the epoch variable. Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=1418703&r1=1418702&r2=1418703&view=diff ============================================================================== --- httpd/httpd/trunk/build/rpm/httpd.spec.in (original) +++ httpd/httpd/trunk/build/rpm/httpd.spec.in Sat Dec 8 16:41:23 2012 @@ -33,7 +33,7 @@ Group: Development/Libraries Summary: Development tools for the Apache HTTP server. Obsoletes: secureweb-devel, apache-devel Requires: apr-devel, apr-util-devel, pkgconfig, libtool -Requires: httpd = %{epoch}:%{version}-%{release} +Requires: httpd = %{version}-%{release} %description devel The httpd-devel package contains the APXS binary and other files @@ -47,7 +47,7 @@ to install this package. %package manual Group: Documentation Summary: Documentation for the Apache HTTP server. -Requires: httpd = %{epoch}:%{version}-%{release} +Requires: httpd = :%{version}-%{release} Obsoletes: secureweb-manual, apache-manual %description manual @@ -67,7 +67,7 @@ the Apache HTTP Server. Group: System Environment/Daemons Summary: LDAP modules for the Apache HTTP server BuildRequires: openldap-devel -Requires: httpd = %{epoch}:%{version}-%{release}, httpd-mmn = %{mmn} +Requires: httpd = %{version}-%{release}, httpd-mmn = %{mmn} %description -n mod_authnz_ldap The mod_authnz_ldap module for the Apache HTTP server provides @@ -78,7 +78,7 @@ mod_ldap provides an LDAP cache. Group: System Environment/Daemons Summary: Lua language module for the Apache HTTP server BuildRequires: lua-devel -Requires: httpd = %{epoch}:%{version}-%{release}, httpd-mmn = %{mmn} +Requires: httpd = %{version}-%{release}, httpd-mmn = %{mmn} %description -n mod_lua The mod_lua module for the Apache HTTP server allows the server to be @@ -88,7 +88,7 @@ extended with scripts written in the Lua Group: System Environment/Daemons Summary: Proxy HTML filter modules for the Apache HTTP server BuildRequires: libxml2-devel -Requires: httpd = %{epoch}:%{version}-%{release}, httpd-mmn = %{mmn} +Requires: httpd = %{version}-%{release}, httpd-mmn = %{mmn} %description -n mod_proxy_html The mod_proxy_html module for the Apache HTTP server provides @@ -100,7 +100,7 @@ enhanced charset/internationalisation su Group: System Environment/Daemons Summary: Distcache shared object cache module for the Apache HTTP server BuildRequires: distcache-devel -Requires: httpd = %{epoch}:%{version}-%{release}, httpd-mmn = %{mmn} +Requires: httpd = %{version}-%{release}, httpd-mmn = %{mmn} %description -n mod_socache_dc The mod_socache_dc module for the Apache HTTP server allows the shared @@ -112,7 +112,7 @@ Summary: SSL/TLS module for the Apache H BuildRequires: openssl-devel Requires(post): openssl, /bin/cat Requires(pre): httpd -Requires: httpd = %{epoch}:%{version}-%{release}, httpd-mmn = %{mmn} +Requires: httpd = %{version}-%{release}, httpd-mmn = %{mmn} %description -n mod_ssl The mod_ssl module provides strong cryptography for the Apache Web