diff --git a/.gitignore b/.gitignore index 9c47238..8ab37f6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /FeedReader-1.6.1.tar.gz /FeedReader-1.6.2.tar.gz /FeedReader-2.0-beta-1.tar.gz +/FeedReader-2.0.tar.gz diff --git a/feedreader.spec b/feedreader.spec index ea44417..47f2f8f 100644 --- a/feedreader.spec +++ b/feedreader.spec @@ -1,8 +1,6 @@ -%global pre beta-1 - Name: feedreader Version: 2.0 -Release: 0.2.beta1%{?dist} +Release: 1%{?dist} Summary: RSS desktop client # Some of the source files are GPLv3+ and some are LGPLv3+, which makes the @@ -12,7 +10,7 @@ URL: https://github.com/jangernert/FeedReader Source0: https://github.com/jangernert/FeedReader/archive/v%{version}%{?pre:-%{pre}}/FeedReader-%{version}%{?pre:-%{pre}}.tar.gz BuildRequires: cmake -BuildRequires: intltool +BuildRequires: gettext BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(goa-1.0) BuildRequires: pkgconfig(gstreamer-1.0) @@ -28,7 +26,6 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(rest-0.7) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(webkit2gtk-4.0) -BuildRequires: vala-devel BuildRequires: vala BuildRequires: /usr/bin/appstream-util BuildRequires: /usr/bin/desktop-file-validate @@ -50,10 +47,7 @@ modern desktop application. %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake} \ - -DUSE_WEBKIT_4=ON \ - -DWITH_LIBUNITY=OFF \ - .. +%cmake .. popd make -C %{_target_platform} @@ -66,14 +60,14 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/*/actions/*.svg.moved # Install appdata file mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cp -a data/feedreader.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/ +cp -a data/org.gnome.FeedReader.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/ %find_lang FeedReader %check -appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/feedreader.appdata.xml -desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/feedreader.desktop +appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/org.gnome.FeedReader.appdata.xml +desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.FeedReader.desktop %post @@ -97,16 +91,20 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %license COPYING %doc Changelog %{_bindir}/feedreader* +%{_libdir}/FeedReader/ %{_datadir}/FeedReader/ -%{_datadir}/appdata/feedreader.appdata.xml -%{_datadir}/applications/feedreader.desktop -%{_datadir}/dbus-1/services/feedreader.service +%{_datadir}/appdata/org.gnome.FeedReader.appdata.xml +%{_datadir}/applications/org.gnome.FeedReader.desktop +%{_datadir}/dbus-1/services/org.gnome.FeedReader.Daemon.service %{_datadir}/glib-2.0/schemas/org.gnome.feedreader*.gschema.xml -%{_datadir}/icons/hicolor/*/apps/feedreader.svg -%{_datadir}/icons/hicolor/scalable/apps/feedreader-symbolic.svg +%{_datadir}/icons/hicolor/*/apps/org.gnome.FeedReader.svg +%{_datadir}/icons/hicolor/scalable/apps/org.gnome.FeedReader-symbolic.svg %changelog +* Mon Feb 13 2017 Pete Walter - 2.0-1 +- Update to 2.0 + * Fri Feb 10 2017 Fedora Release Engineering - 2.0-0.2.beta1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 6ac075e..4179f14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FeedReader-2.0-beta-1.tar.gz) = 6b02017155085da7e3a68cd9289d4cebac667dec3608e511b68993239d497e2924ab7178b6153c34aa2fafa78aa57307fcc46a6943a94f73c77223df671034ca +SHA512 (FeedReader-2.0.tar.gz) = 35a7b08799e196ddb0afddea5a7e12ad5ece7414b5b86179bdd72e948081aec60a3522d1da56dc204229c277b372ea397d32d66271b4a9da86a5e397cac1d1bc