From a235ef7fae71ce43e0d7f8609e1fed2c0d15c98b Mon Sep 17 00:00:00 2001
From: Satya Komaragiri <skomarag@redhat.com>
Date: Jun 20 2011 07:09:39 +0000
Subject: Update to 0.5.5


---

diff --git a/beacon.spec b/beacon.spec
index 42a626f..160bb11 100644
--- a/beacon.spec
+++ b/beacon.spec
@@ -1,26 +1,25 @@
 Name:			beacon
 Version:		0.5
-Release:		4%{?dist}
+Release:		5%{?dist}
 Summary:		WYSIWYG editor for docbook xml
 
 Group:			Applications/Editors
 License:		GPLv3+
 URL:			http://fedoraproject.org/wiki/DocBook_Editor
-Source0:		http://rakesh.fedorapeople.org/misc/%{name}-%{version}.tar.gz
-Source1:		httpd-beacon.conf
+Source0:		%{name}-%{version}.tar.gz
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:		noarch
-Requires:		php, httpd, php-xml, mysql-server, mysql, python-fedora
+Requires:		php, httpd, php-xml, mysql-server, mysql, php-mysql
 
 %description
-Beacon is an XSLT based plug-able WYSIWYG editor for DocBook xml. It 
-is intended to serve as an easy to use tool which will attract new 
+Beacon is an XSLT based plug-able WYSIWYG editor for DocBook xml. It
+is intended to serve as an easy to use tool which will attract new
 contributors who would otherwise be discouraged by the steep learning
 curve involved with DocBook and will also provide a convenient
 alternative to those who are old-timers. More information is available
 at https://fedoraproject.org/wiki/DocBook_Editor_Documentation and
 https://fedoraproject.org/wiki/DocBook_Editor_Feature.
- 
+
 %prep
 %setup -q
 
@@ -30,10 +29,12 @@ https://fedoraproject.org/wiki/DocBook_Editor_Feature.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/beacon
-cp -rp beacon php $RPM_BUILD_ROOT/%{_datadir}/beacon/
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
-cp -p  %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
+make install prefix=$RPM_BUILD_ROOT/usr sysconfdir=$RPM_BUILD_ROOT/etc/
+
+#mkdir -p $RPM_BUILD_ROOT/%{_datadir}/beacon
+#cp -rp beacon php $RPM_BUILD_ROOT/%{_datadir}/beacon/
+#mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
+#cp -p  httpd-beacon.conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -41,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc docs/* LICENSE README TODO README_DATABASE README.fedora
+%doc docs/* LICENSE README TODO
 %{_datadir}/beacon/*
 %attr(0700,apache,apache)
 
@@ -50,8 +51,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Sat Jun 18 2011 P J P <pj.pandit@yahoo.co.in> 0.5-5
+- Updated source to include upstream bug fixes.
+- included httpd-beacon.conf into the source tarball.
+
+* Tue May 10 2011 Satya Komaragiri <satyak@fedoraproject.org> 0.5-4
+- Added dependency on php-mysql.
+- Made mysql login as default.
+- Handled file names with spaces.
 
 * Wed Aug 24 2009 Satya Komaragiri <satyak@fedoraproject.org> 0.5-3
 - Improved description.
@@ -65,5 +72,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Aug 12 2009 Satya Komaragiri <satyak@fedoraproject.org> 0.5-1
 - Initial version
-
-
diff --git a/httpd-beacon.conf b/httpd-beacon.conf
deleted file mode 100644
index d832969..0000000
--- a/httpd-beacon.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Beacon specific httpd conf file
-#PHPIniDir "/etc/beacon/php-beacon.ini"
-Alias /beacon /usr/share/beacon
-<Directory /usr/share/beacon>
-Order allow,deny
-Allow from all
-</Directory>
-
diff --git a/sources b/sources
index ff51bd2..ff52fd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1288e8d6dd41b4a95dbfcfc66bd485a4  beacon-0.5.tar.gz
+3f36cd93efa5332afbfad4351144e7d9  beacon-0.5.tar.gz