old changes

diff --git a/nagios-nlg.spec b/nagios-nlg.spec
index c4a2ba6acbf7bef4befb99930336747e2fe98ce8..fce4f852530edf0799a3fa12a8cdb69b72ba6dee 100644 (file)
--- a/nagios-nlg.spec
+++ b/nagios-nlg.spec
@@ -1,11 +1,14 @@
+%define                sver    %(echo %{version} | tr -d .)
+%define                subver  b3
+%define                rel             0.2
 Summary:       Nagios Looking Glass
 Name:          nagios-nlg
-Version:       1.0.6
-Release:       0.3
+Version:       1.1.0
+Release:       0.%{subver}.%{rel}
 License:       Creative Commons v2.5
 Group:         Applications/WWW
-Source0:       http://www.andyshellam.eu/download.php?file=nlg_106.tar.gz
-# Source0-md5: 9cee281a7c40c59902fc420d14e9c7db
+Source0:       http://www.andyshellam.eu/download.php?file=nlg_%{sver}%{subver}.tar.gz
+# Source0-md5: 8e5d183283a810197ecb305b594bc21d
 URL:           http://www.andyshellam.eu/nlg/
 BuildRequires: sed >= 4.0
 BuildArch:     noarch
@@ -14,12 +17,12 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _appdir %{_datadir}/nagwatch
 
 %description
-Nagios Looking Glass is a web-based application that allows Nagios system
-administrators to provide up-to-the-minute status information about their
-Nagios-monitored network directly to their end users. The application is
-designed to provide a read-only "dashboard" view into the network without the
-complexity and security risks that arise by giving end users access to the
-Nagios web console. 
+Nagios Looking Glass is a web-based application that allows Nagios
+system administrators to provide up-to-the-minute status information
+about their Nagios-monitored network directly to their end users. The
+application is designed to provide a read-only "dashboard" view into
+the network without the complexity and security risks that arise by
+giving end users access to the Nagios web console.
 
 %package s3_poller
 Summary:       Data poller for Nagios Looking Glass
@@ -37,12 +40,12 @@ Requires:   php-common >= 4:5.0
 Requires:      webserver(php)
 
 %description s3_client
-The client that renders data from s3_poller on an AJAX-enabled web-page with
-the relevant data.
+The client that renders data from s3_poller on an AJAX-enabled
+web-page with the relevant data.
 
 %prep
-%setup -q -n nlg_106
-find '(' -name '*.php' -o -name '*.txt' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+%setup -q -n nlg_%{sver}%{subver}
+find '(' -name '*.php' -o -name '*.txt' -o -name '*.dist' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
 
 rm -f client/sync-files/DELETE_ME.txt
 rm -f server/index/DELETE_ME.txt
@@ -61,5 +64,5 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.txt docs/*.pdf
+%doc *.txt
 %{_datadir}/*