From d75a35fab26215e58c3871cd4c0f9e288b93cd18 Mon Sep 17 00:00:00 2001 From: tuibuilder_pel7x64builder0 Date: Sun, 21 Jul 2019 13:37:43 +0200 Subject: [PATCH] newsboat package update Signed-off-by: tuibuilder_pel7x64builder0 --- ...ate-dependencies-to-latest-in-Fedora.patch | 238 ++++++++++++++++++ ...Tweak-tests-for-32-bit-architectures.patch | 81 ++++++ SPECS/newsboat.spec | 90 +++++++ 3 files changed, 409 insertions(+) create mode 100644 SOURCES/0001-Upgrade-crate-dependencies-to-latest-in-Fedora.patch create mode 100644 SOURCES/0002-Tweak-tests-for-32-bit-architectures.patch create mode 100644 SPECS/newsboat.spec diff --git a/SOURCES/0001-Upgrade-crate-dependencies-to-latest-in-Fedora.patch b/SOURCES/0001-Upgrade-crate-dependencies-to-latest-in-Fedora.patch new file mode 100644 index 0000000..0086ab4 --- /dev/null +++ b/SOURCES/0001-Upgrade-crate-dependencies-to-latest-in-Fedora.patch @@ -0,0 +1,238 @@ +From f6e28afc6ca98da8a635b4a9c332357ab07dacf4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= +Date: Thu, 27 Jun 2019 15:48:05 +0200 +Subject: [PATCH] Upgrade crate dependencies to latest in Fedora +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jan Staněk +--- + Cargo.lock | 60 +++++++++++++++++++++------------- + rust/libnewsboat/Cargo.toml | 10 ++---- + rust/libnewsboat/src/logger.rs | 2 +- + 3 files changed, 42 insertions(+), 30 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 94310ee0..cf2c6194 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -138,11 +138,21 @@ dependencies = [ + + [[package]] + name = "dirs" +-version = "1.0.4" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "dirs-sys" ++version = "0.3.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", +- "redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -235,13 +245,13 @@ dependencies = [ + "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gettext-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gettext-sys 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", + "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", + "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +- "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "once_cell 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "proptest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -284,10 +294,10 @@ dependencies = [ + + [[package]] + name = "lock_api" +-version = "0.1.5" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -333,10 +343,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "once_cell" +-version = "0.1.8" ++version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -353,20 +364,24 @@ dependencies = [ + + [[package]] + name = "parking_lot" +-version = "0.7.1" ++version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ +- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] + name = "parking_lot_core" +-version = "0.4.0" ++version = "0.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ ++ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -554,12 +569,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "redox_users" +-version = "0.2.0" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + dependencies = [ + "argon2rs 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", +- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_os 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -647,7 +662,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "scopeguard" +-version = "0.3.3" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] +@@ -867,7 +882,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" + "checksum curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71c63a540a9ee4e15e56c3ed9b11a2f121239b9f6d7b7fe30f616e048148df9a" +-"checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a" ++"checksum dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c4ef5a8b902d393339e2a2c7fe573af92ce7e0ee5a3ff827b4c9ad7e07e4fa1" ++"checksum dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "937756392ec77d1f2dd9dc3ac9d69867d109a2121479d72c364e42f4cab21e2d" + "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" + "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" + "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +@@ -881,17 +897,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum libc 0.2.48 (registry+https://github.com/rust-lang/crates.io-index)" = "e962c7641008ac010fa60a7dfdc1712449f29c44ef2d4702394aea943ee75047" + "checksum libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "44ebbc760fd2d2f4d93de09a0e13d97e057612052e871da9985cedcb451e6bd5" + "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab" +-"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" ++"checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff" + "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" + "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" + "checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" + "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea" + "checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" +-"checksum once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "532c29a261168a45ce28948f9537ddd7a5dd272cc513b3017b1e82a88f962c37" ++"checksum once_cell 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c7118943e044e53fb4f0400ba153201e7b3e1ee61f137d47aa45367223caa19" + "checksum openssl-sys 0.9.46 (registry+https://github.com/rust-lang/crates.io-index)" = "05636e06b4f8762d4b81d24a351f3966f38bd25ccbcfd235606c91fdb82cc60f" +-"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" +-"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" ++"checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7" ++"checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c" + "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" + "checksum proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)" = "4d317f9caece796be1980837fd5cb3dfec5613ebdb04ad0956deea83ce168915" +@@ -912,7 +928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" + "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" + "checksum redox_syscall 0.1.51 (registry+https://github.com/rust-lang/crates.io-index)" = "423e376fffca3dfa06c9e9790a9ccd282fafb3cc6e6397d01dbf64f9bacc6b85" +-"checksum redox_users 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26" ++"checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" + "checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" + "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f" + "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e" +@@ -923,7 +939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" + "checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" + "checksum scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" +-"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" ++"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" + "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" + "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + "checksum smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "88aea073965ab29f6edb5493faf96ad662fb18aa9eeb186a3b7057951605ed15" +diff --git a/rust/libnewsboat/Cargo.toml b/rust/libnewsboat/Cargo.toml +index 3174895f..535173f2 100644 +--- a/rust/libnewsboat/Cargo.toml ++++ b/rust/libnewsboat/Cargo.toml +@@ -8,10 +8,10 @@ strprintf = { path="../strprintf" } + + chrono = "0.4" + rand = "0.5" +-once_cell = "0.1.6" ++once_cell = "0.2.1" + regex = "1.0" + url = "1.7" +-dirs = "1.0.4" ++dirs = "2.0.1" + backtrace = "= 0.3" + unicode-width = "0.1.5" + nom = "^4.1" +@@ -20,10 +20,6 @@ curl-sys = "0.4.5" + libc = "0.2" + gettext-rs = "0.4.1" + +-# We don't use the following crates, but we pin their versions to make sure +-# that Newsboat builds with Rust 1.25 and later. +-libz-sys = "= 1.0.17" +- + [dependencies.clap] + version = "2.33" + # This disables three features, for the following reasons: +@@ -43,4 +39,4 @@ features = [ "gettext-system" ] + + [dev-dependencies] + tempfile = "3" +-proptest = "0.7" ++proptest = "0.9" +diff --git a/rust/libnewsboat/src/logger.rs b/rust/libnewsboat/src/logger.rs +index 6934c61e..a33bc693 100644 +--- a/rust/libnewsboat/src/logger.rs ++++ b/rust/libnewsboat/src/logger.rs +@@ -279,7 +279,7 @@ impl Logger { + } + } + +-static GLOBAL_LOGGER: OnceCell = OnceCell::INIT; ++static GLOBAL_LOGGER: OnceCell = OnceCell::new(); + + /// Returns a global logger instance. + /// +-- +2.21.0 diff --git a/SOURCES/0002-Tweak-tests-for-32-bit-architectures.patch b/SOURCES/0002-Tweak-tests-for-32-bit-architectures.patch new file mode 100644 index 0000000..0371bfe --- /dev/null +++ b/SOURCES/0002-Tweak-tests-for-32-bit-architectures.patch @@ -0,0 +1,81 @@ +From cc3af67b57fd00d1e2e6dc6a09dfcd1f8f54019b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= +Date: Fri, 28 Jun 2019 10:50:07 +0200 +Subject: [PATCH] Tweak tests for 32-bit architectures +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jan Staněk +--- + rust/strprintf/src/lib.rs | 2 ++ + test/strprintf.cpp | 12 +++++++----- + 2 files changed, 9 insertions(+), 5 deletions(-) + +diff --git a/rust/strprintf/src/lib.rs b/rust/strprintf/src/lib.rs +index eb8c5d57..891e4574 100644 +--- a/rust/strprintf/src/lib.rs ++++ b/rust/strprintf/src/lib.rs +@@ -154,6 +154,7 @@ mod tests { + } + + #[test] ++ #[cfg(target_pointer_width = "64")] + fn formats_i64() { + assert_eq!(fmt!("%li", 42i64), "42"); + assert_eq!(fmt!("%li", std::i32::MIN as i64 - 1), "-2147483649"); +@@ -165,6 +166,7 @@ mod tests { + } + + #[test] ++ #[cfg(target_pointer_width = "64")] + fn formats_u64() { + assert_eq!(fmt!("%lu", 42u64), "42"); + assert_eq!(fmt!("%lu", 0u64), "0"); +diff --git a/test/strprintf.cpp b/test/strprintf.cpp +index 2e57bdd2..5aee9b1e 100644 +--- a/test/strprintf.cpp ++++ b/test/strprintf.cpp +@@ -1,5 +1,6 @@ + #include "strprintf.h" + ++#include + #include + + #include "3rd-party/catch.hpp" +@@ -130,17 +131,17 @@ TEST_CASE("strprintf::fmt() formats long int", "[strprintf]") + { + REQUIRE(strprintf::fmt("%li", 42l) == "42"); + ++#if LONG_MIN < INT_MIN + const auto int_min = std::numeric_limits::min(); +- const auto long_min = std::numeric_limits::min(); +- REQUIRE(long_min < int_min); + REQUIRE(int_min == -2147483648); + REQUIRE(strprintf::fmt("%li", int_min - 1l) == "-2147483649"); ++#endif + ++#if LONG_MAX > INT_MAX + const auto int_max = std::numeric_limits::max(); +- const auto long_max = std::numeric_limits::max(); +- REQUIRE(long_max > int_max); + REQUIRE(int_max == 2147483647); + REQUIRE(strprintf::fmt("%li", int_max + 1l) == "2147483648"); ++#endif + } + + TEST_CASE("strprintf::fmt() formats long unsigned int", "[strprintf]") +@@ -149,9 +150,10 @@ TEST_CASE("strprintf::fmt() formats long unsigned int", "[strprintf]") + + REQUIRE(strprintf::fmt("%lu", 0lu) == "0"); + ++#if ULONG_MAX == 18446744073709551615lu + const auto ulong_max = std::numeric_limits::max(); +- REQUIRE(ulong_max == 18446744073709551615lu); + REQUIRE(strprintf::fmt("%lu", ulong_max) == "18446744073709551615"); ++#endif + } + + TEST_CASE("strprintf::fmt() formats long long int", "[strprintf]") +-- +2.21.0 diff --git a/SPECS/newsboat.spec b/SPECS/newsboat.spec new file mode 100644 index 0000000..0f3d874 --- /dev/null +++ b/SPECS/newsboat.spec @@ -0,0 +1,90 @@ +Name: newsboat +Version: 2.16.1 +Release: 1%{?dist} +Summary: RSS/Atom feed reader for the text console + +License: MIT +URL: https://www.newsboat.org +Source0: https://newsboat.org/releases/%{version}/%{name}-%{version}.tar.xz + +#Patch0: 0001-Upgrade-crate-dependencies-to-latest-in-Fedora.patch +#Patch1: 0002-Tweak-tests-for-32-bit-architectures.patch + +BuildRequires: asciidoc +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: pkgconfig +BuildRequires: pkgconfig(json-c) >= 0.11 +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(ncursesw) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(stfl) +# libnewsboat and other rust parts +BuildRequires: git + +Provides: podboat = %{version}-%{release} + +%description +Newsboat is a fork of Newsbeuter, an RSS/Atom feed reader for the text console. + +%prep +%autosetup -p1 +# Remove executable bit from example scripts +find contrib/ -type f -exec chmod -x '{}' + + +%build +# Respect RPM settings +# CARGO_FLAGS is used/appended to by this Makefile +#%set_build_flags +export CARGO_FLAGS="%{__cargo_common_opts}" +# Verify non-rust deps and setup LDFLAGS +sh config.sh + +# Build the project +# Replace bare `cargo` with the one user by %%cargo_* macros +%make_build CARGO="%{__cargo}" all test + +%install +%make_install prefix="%{_prefix}" + +%find_lang %{name} + +%check +# TMPDIR=%%{_tmppath} ./test/test # Have issues with permission in tpmdir +%cargo_test + +%files -f %{name}.lang +%license LICENSE +%doc README.md + +%{_bindir}/newsboat +%{_bindir}/podboat + +%{_mandir}/man1/newsboat.1* +%{_mandir}/man1/podboat.1* +%{_pkgdocdir} + +%changelog +* Thu Jun 27 2019 Jan Staněk - 2.16.1-1 +- Upgrade to version 2.16.1 +- Add %%check section + +* Mon Mar 25 2019 Jan Staněk - 2.15-1 +- Upgrade to version 2.15 + +* Mon Feb 18 2019 Jan Staněk - 2.14.1-1 +- Upgrade to version 2.14.1 + +* Fri Feb 01 2019 Fedora Release Engineering - 2.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 25 2018 Lee Keitel - 2.12-1 +- Bumped version to 2.12 + +* Wed Jun 13 2018 Lee Keitel - 2.11.1-1 +- Initial version 2.11.1