From 68f6a073f74c0288ce86e84d1e29803f22974623 Mon Sep 17 00:00:00 2001
From: makkalot <makkalot@gmail.com>
Date: Mon, 14 Jul 2008 21:56:00 +0300
Subject: there was a conflict due to merging errors in spec file (cherry
 picked from commit 3119ab486a6360278ebdafc8cba7724c6e79a3e5)

---
 funcweb/funcweb.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'funcweb')

diff --git a/funcweb/funcweb.spec b/funcweb/funcweb.spec
index 39d394b..91c8fe4 100644
--- a/funcweb/funcweb.spec
+++ b/funcweb/funcweb.spec
@@ -12,7 +12,7 @@ Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source0: %{name}-%{version}.tar.gz 
-Source1: %{name}.te
+Source2: %{name}.te
 
 #packages that are required
 Requires: python >= 2.3
@@ -62,7 +62,7 @@ This package adds SELinux policy for FuncWeb
 %prep
 %setup -q
 mkdir -p selinux
-cp -p %{SOURCE1} selinux/
+cp -p %{SOURCE2} selinux/
 
 %build
 %{__python} setup.py build
-- 
cgit