rpms/xlog/devel xlog.spec,1.7,1.8

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/xlog/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31267

Modified Files:
	xlog.spec 
Log Message:
* Tue Feb 17 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-1
- add --docdir option
- remove m4 creation
- drop patch0 (fixed upstream)
- new upstream release


Index: xlog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xlog/devel/xlog.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xlog.spec	10 Dec 2008 13:05:49 -0000	1.7
+++ xlog.spec	17 Feb 2009 08:02:10 -0000	1.8
@@ -1,15 +1,13 @@
 Name:           xlog
-Version:        1.8.1
-Release:        3%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
 License:        GPLv3
 URL:            http://pg4i.chronos.org.uk/linux/%{name}.html
 Source0:        http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz
-Patch0:         xlog-1.8.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
 BuildRequires: libgnomeprint22-devel
 BuildRequires: hamlib-devel
@@ -26,18 +24,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .doc
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
-sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio;/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
-#missing directory from package
-mkdir m4
-autoreconf -i -f
-%configure --enable-hamlib
-make %{?_smp_mflags} -e DOCDIR='%{_docdir}/%{name}-%{version}'
+%configure --enable-hamlib --docdir=%{_docdir}/%{name}-%{version}
+make %{?_smp_mflags} 
 
 
 %install
@@ -66,7 +60,7 @@
 
 %files -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING NEWS README data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
+%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dxcc
@@ -80,6 +74,12 @@
 
 
 %changelog
+* Tue Feb 17 2009 Lucian Langa <cooly at gnome.eu.org> - 2.0-1
+- add --docdir option
+- remove m4 creation
+- drop patch0 (fixed upstream)
+- new upstream release
+
 * Wed Dec 10 2008 Lucian Langa <cooly at gnome.eu.org> - 1.8.1-3
 - modify patch to correctly display documentation