- version 2.0

- delete libmrss-devel BR
- use Makefile.prof as makefile - because of optflags (and delete todo)

Changed files:
    newsbeuter.spec -> 1.12

diff --git a/newsbeuter.spec b/newsbeuter.spec
index eab6206d1e4998d4897b5761116bc8b39ea26def..e797bec26479aa667995559eb06272a33c7af67e 100644 (file)
--- a/newsbeuter.spec
+++ b/newsbeuter.spec
@@ -1,17 +1,16 @@
-# TODO: optflags
 Summary:       Newsbeuter - an RSS feed reader for the text console
 Summary(hu.UTF-8):     Newsbeuter - egy RSS hírolvasó szöveges terminálra
 Summary(pl.UTF-8):     Newsbeuter - czytnik RSS dla terminala tekstowego
 Name:          newsbeuter
-Version:       1.3
-Release:       2
-License:       GPL v2
+Version:       2.0
+Release:       1
+License:       MIT/X
 Group:         Applications/Networking
 Source0:       http://www.newsbeuter.org/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 7246e37ed0067ab55803be4b1d144c50
+# Source0-md5: 3b506b0c87f6e306917b7732d56eecf1
+Source1:       http://www.newsbeuter.org/doc/%{name}.html
 URL:           http://www.newsbeuter.org/
 BuildRequires: gettext-devel
-BuildRequires: libmrss-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
 BuildRequires: sqlite3-devel
@@ -19,8 +18,6 @@ BuildRequires:        stfl-devel >=0.19
 BuildRequires: stfl-static
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%{expand:%%define      _sysconfdir     %{_sysconfdir}/X11}
-
 %description
 Newsbeuter is an RSS feedreader. Newsbeuter is designed to be used on
 text terminals on Unix or Unix-like systems.
@@ -35,9 +32,11 @@ tekstowych w systemach uniksowych.
 
 %prep
 %setup -q
+%{__sed} -i "s@CXXFLAGS+=.*@CXXFLAGS+=%{rpmcxxflags}@" Makefile.prof
+%{__sed} -i "s@CFLAGS+=.*@CFLAGS+=%{rpmcflags}@" Makefile.prof
 
 %build
-%{__make} \
+%{__make} -f Makefile.prof \
        prefix=%{_prefix} \
        docdir=%{_docdir}/%{name}-%{version}
 
@@ -50,6 +49,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/es{_ES,}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/locale/zh{,_CN}
+%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install AUTHORS README $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %find_lang %{name}
 
@@ -58,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS LICENSE README
+%doc %{_docdir}/%{name}-%{version}
 %attr(755,root,root) %{_bindir}/%{name}
 %attr(755,root,root) %{_bindir}/podbeuter
 %{_mandir}/man1/%{name}*