pagure pushed to rpms/python-jaraco-logging (rawhide). "Update to
version 3.2.0 (fedora#2236348) (..more)"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:23:12 UTC
From 7cbdbefda26ece98ddad4610227684569543158b Mon Sep 17 00:00:00 2001
From: Ondrej Mosnáček <omosnacek(a)gmail.com>
Date: Aug 31 2023 20:59:34 +0000
Subject: Update to version 3.2.0 (fedora#2236348)
Signed-off-by: Ondrej Mosnáček <omosnacek(a)gmail.com>
---
diff --git a/python-jaraco-logging.spec b/python-jaraco-logging.spec
index 9af798f..ff995d7 100644
--- a/python-jaraco-logging.spec
+++ b/python-jaraco-logging.spec
@@ -5,7 +5,7 @@
%global pkgname %{modname}-logging
Name: python-%{pkgname}
-Version: 3.1.2
+Version: 3.2.0
Release: %autorelease
Summary: Support for Python logging facility
@@ -53,7 +53,7 @@ sed -i 's/setuptools>=56/setuptools/' pyproject.toml
%files -n python3-%{pkgname} -f %{pyproject_files}
%license LICENSE
-%doc README.rst CHANGES.rst
+%doc README.rst NEWS.rst
# Owned by python3dist(jaraco)
%exclude %dir %{python3_sitelib}/jaraco
diff --git a/sources b/sources
index caaec81..f7b72d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jaraco.logging-3.1.2.tar.gz) = d6d26364e44be089616913938d200f26c9da269853d673f1518c3e29905961dda264b95e60a7051e4e0d6b873eb9b65faefa9962a48e2cad43435ca32ef0e1f3
+SHA512 (jaraco.logging-3.2.0.tar.gz) = dd5a66bf03d01378e542553c08f8daf6aa2ec9aa8087b8d11f34b4527a1fb1e41b20142ac9b5d9e5eb8f510f50f7d1a3ec11a8eff9871190b4d4392b68bbada7
https://src.fedoraproject.org/rpms/python-jaraco-logging/c/7cbdbefda26ece...
9 months
decathorpe pushed to rpms/rust-pq-sys (f39). "Update to version
0.4.8; Fixes RHBZ#2187760"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:20:30 UTC
From e18876647da357b0a6e0b6ee966f02a15979e8b2 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 20:05:49 +0000
Subject: Update to version 0.4.8; Fixes RHBZ#2187760
---
diff --git a/.gitignore b/.gitignore
index 33da6d7..990fc63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/pq-sys-0.4.6.crate
/pq-sys-0.4.7.crate
+/pq-sys-0.4.8.crate
diff --git a/0001-Unconditionally-use-pkg-config-to-link-against-syste.patch b/0001-Unconditionally-use-pkg-config-to-link-against-syste.patch
new file mode 100644
index 0000000..54cf32e
--- /dev/null
+++ b/0001-Unconditionally-use-pkg-config-to-link-against-syste.patch
@@ -0,0 +1,216 @@
+From 3b9c72eeb08946147f8a31a12a313ca01b225810 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Thu, 31 Aug 2023 22:03:55 +0200
+Subject: [PATCH] Unconditionally use pkg-config to link against system libpq
+
+---
+ build.rs | 195 +------------------------------------------------------
+ 1 file changed, 1 insertion(+), 194 deletions(-)
+
+diff --git a/build.rs b/build.rs
+index 2640f27..3a146aa 100644
+--- a/build.rs
++++ b/build.rs
+@@ -1,198 +1,5 @@
+-#[cfg(feature="pkg-config")]
+ extern crate pkg_config;
+
+-#[cfg(target_env = "msvc")]
+-extern crate vcpkg;
+-
+-use std::process::Command;
+-use std::env;
+-use std::path::PathBuf;
+-use std::fmt::{self, Display};
+-
+-enum LinkType {
+- Static,
+- Dynamic
+-}
+-
+-impl Display for LinkType {
+- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+- match *self {
+- LinkType::Static => write!(f, "static"),
+- LinkType::Dynamic => write!(f, "dylib"),
+- }
+- }
+-}
+-
+-struct LinkingOptions {
+- linking_type: Option<LinkType>,
+- lib_name: &'static str,
+-}
+-
+-impl LinkingOptions {
+- fn from_name_and_type(lib_name: &'static str, tpe: LinkType) -> Self {
+- LinkingOptions {
+- linking_type: Some(tpe),
+- lib_name
+- }
+- }
+- fn from_name(lib_name: &'static str) -> Self {
+- LinkingOptions {
+- linking_type: None,
+- lib_name
+- }
+- }
+-
+- fn from_env() -> Self {
+- // On Windows-MSVC, always link dynamically
+- if cfg!(all(windows, target_env="msvc")) {
+- return LinkingOptions::from_name_and_type("libpq", LinkType::Dynamic);
+- }
+-
+- // Link unconditionally statically
+- if env::var_os("PQ_LIB_STATIC").is_some() {
+- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
+- }
+-
+- // Examine the per-target env vars
+- if let Ok(target) = env::var("TARGET") {
+- let pg_config_for_target = format!("PQ_LIB_STATIC_{}", target.to_ascii_uppercase().replace("-", "_"));
+- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
+- if env::var_os(&pg_config_for_target).is_some() {
+- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
+- }
+- }
+-
+- // Otherwise, don't specify
+- LinkingOptions::from_name("pq")
+- }
+-}
+-
+-impl Display for LinkingOptions {
+- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+- if let Some(ref t) = self.linking_type {
+- write!(f, "{}=", t)?;
+- }
+- write!(f, "{}", self.lib_name)
+- }
+-}
+-
+ fn main() {
+- println!("cargo:rerun-if-env-changed=PQ_LIB_STATIC");
+- println!("cargo:rerun-if-env-changed=TARGET");
+-
+- // if target is specified the more concrete pq_lib_dir overwrites a more general one
+- let lib_dir = if let Ok(target) = env::var("TARGET") {
+- let pq_lib_dir_for_target = format!("PQ_LIB_DIR_{}", target.to_ascii_uppercase().replace("-", "_"));
+- check_and_use_lib_dir(&pq_lib_dir_for_target).or_else(|_| check_and_use_lib_dir("PQ_LIB_DIR"))
+- }
+- else{
+- check_and_use_lib_dir("PQ_LIB_DIR")
+- };
+-
+- if let Ok(lib_dir) = lib_dir {
+- println!("cargo:rustc-link-search=native={}", lib_dir);
+- } else if configured_by_pkg_config() {
+- return // pkg_config does everything for us, including output for cargo
+- } else if configured_by_vcpkg() {
+- return // vcpkg does everything for us, including output for cargo
+- } else if let Some(path) = pg_config_output("--libdir") {
+- let path = replace_homebrew_path_on_mac(path);
+- println!("cargo:rustc-link-search=native={}", path);
+- }
+- println!("cargo:rustc-link-lib={}", LinkingOptions::from_env());
+-}
+-
+-#[cfg(feature = "pkg-config")]
+-fn configured_by_pkg_config() -> bool {
+- pkg_config::probe_library("libpq").is_ok()
+-}
+-
+-#[cfg(not(feature = "pkg-config"))]
+-fn configured_by_pkg_config() -> bool {
+- false
+-}
+-
+-#[cfg(target_env = "msvc")]
+-fn configured_by_vcpkg() -> bool {
+- vcpkg::find_package("libpq").map(|_| {
+- println!("cargo:rustc-link-lib=crypt32");
+- println!("cargo:rustc-link-lib=gdi32");
+- println!("cargo:rustc-link-lib=user32");
+- println!("cargo:rustc-link-lib=secur32");
+- println!("cargo:rustc-link-lib=shell32");
+- println!("cargo:rustc-link-lib=wldap32");
+- }).is_ok()
+-}
+-
+-#[cfg(not(target_env = "msvc"))]
+-fn configured_by_vcpkg() -> bool {
+- false
+-}
+-
+-fn check_and_use_lib_dir(var_name: &str) -> Result<String, env::VarError>{
+- println!("cargo:rerun-if-env-changed={:?}", var_name);
+- println!("{:?} = {:?}", var_name , env::var(var_name));
+-
+- let pq_lib_dir = env::var(var_name);
+- if let Ok(pg_lib_path) = pq_lib_dir.clone() {
+- let path = PathBuf::from(&pg_lib_path);
+- if !path.exists() {
+- panic!("Folder {:?} doesn't exist in the configured path: {:?}", var_name, path);
+- }
+- }
+- pq_lib_dir
+-}
+-
+-fn pg_config_path() -> PathBuf {
+- if let Ok(target) = env::var("TARGET") {
+- let pg_config_for_target = &format!("PG_CONFIG_{}", target.to_ascii_uppercase().replace("-", "_"));
+- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
+- if let Some(pg_config_path) = env::var_os(pg_config_for_target) {
+-
+- let path = PathBuf::from(&pg_config_path);
+-
+- if !path.exists() {
+- panic!("pg_config doesn't exist in the configured path: {:?}", path);
+- }
+-
+- return path;
+- }
+- }
+- PathBuf::from("pg_config")
+-}
+-
+-fn pg_config_output(command: &str) -> Option<String> {
+- Command::new(pg_config_path())
+- .arg(command)
+- .output()
+- .ok()
+- .into_iter()
+- .filter(|output| output.status.success())
+- .flat_map(|output| String::from_utf8(output.stdout).ok())
+- .map(|output| output.trim().to_string())
+- .next()
+-}
+-
+-#[cfg(not(target_os = "macos"))]
+-fn replace_homebrew_path_on_mac(path: String) -> String {
+- path
+-}
+-
+-#[cfg(target_os = "macos")]
+-fn replace_homebrew_path_on_mac(path: String) -> String {
+- if path == "/usr/local/lib" {
+- Command::new("brew")
+- .arg("--prefix")
+- .arg("postgres")
+- .output()
+- .ok()
+- .into_iter()
+- .filter(|output| output.status.success())
+- .flat_map(|output| String::from_utf8(output.stdout).ok())
+- .map(|output| format!("{}/lib", output.trim()))
+- .next()
+- .unwrap_or(path)
+- } else {
+- path
+- }
++ pkg_config::probe_library("libpq").unwrap();
+ }
+--
+2.41.0
+
diff --git a/0001-unconditionally-use-pkg-config-to-link-against-syste.patch b/0001-unconditionally-use-pkg-config-to-link-against-syste.patch
deleted file mode 100644
index 133d0fa..0000000
--- a/0001-unconditionally-use-pkg-config-to-link-against-syste.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 6ad894cf364730af4b9c859a9f429e813d29e0e2 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Fri, 5 Aug 2022 17:34:40 +0200
-Subject: [PATCH] unconditionally use pkg-config to link against system libpq
-
----
- build.rs | 194 +------------------------------------------------------
- 1 file changed, 1 insertion(+), 193 deletions(-)
-
-diff --git a/build.rs b/build.rs
-index c8f5a6b..3a146aa 100644
---- a/build.rs
-+++ b/build.rs
-@@ -1,197 +1,5 @@
--#[cfg(feature="pkg-config")]
- extern crate pkg_config;
-
--#[cfg(target_env = "msvc")]
--extern crate vcpkg;
--
--use std::process::Command;
--use std::env;
--use std::path::PathBuf;
--use std::fmt::{self, Display};
--
--enum LinkType {
-- Static,
-- Dynamic
--}
--
--impl Display for LinkType {
-- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-- match *self {
-- LinkType::Static => write!(f, "static"),
-- LinkType::Dynamic => write!(f, "dylib"),
-- }
-- }
--}
--
--struct LinkingOptions {
-- linking_type: Option<LinkType>,
-- lib_name: &'static str,
--}
--
--impl LinkingOptions {
-- fn from_name_and_type(lib_name: &'static str, tpe: LinkType) -> Self {
-- LinkingOptions {
-- linking_type: Some(tpe),
-- lib_name
-- }
-- }
-- fn from_name(lib_name: &'static str) -> Self {
-- LinkingOptions {
-- linking_type: None,
-- lib_name
-- }
-- }
--
-- fn from_env() -> Self {
-- // On Windows-MSVC, always link dynamically
-- if cfg!(all(windows, target_env="msvc")) {
-- return LinkingOptions::from_name_and_type("libpq", LinkType::Dynamic);
-- }
--
-- // Link unconditionally statically
-- if env::var_os("PQ_LIB_STATIC").is_some() {
-- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
-- }
--
-- // Examine the per-target env vars
-- if let Ok(target) = env::var("TARGET") {
-- let pg_config_for_target = format!("PQ_LIB_STATIC_{}", target.to_ascii_uppercase().replace("-", "_"));
-- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
-- if env::var_os(&pg_config_for_target).is_some() {
-- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
-- }
-- }
--
-- // Otherwise, don't specify
-- LinkingOptions::from_name("pq")
-- }
--}
--
--impl Display for LinkingOptions {
-- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-- if let Some(ref t) = self.linking_type {
-- write!(f, "{}=", t)?;
-- }
-- write!(f, "{}", self.lib_name)
-- }
--}
--
- fn main() {
-- println!("cargo:rerun-if-env-changed=PQ_LIB_STATIC");
-- println!("cargo:rerun-if-env-changed=TARGET");
--
-- // if target is specified the more concrete pq_lib_dir overwrites a more general one
-- let lib_dir = if let Ok(target) = env::var("TARGET") {
-- let pq_lib_dir_for_target = format!("PQ_LIB_DIR_{}", target.to_ascii_uppercase().replace("-", "_"));
-- check_and_use_lib_dir(&pq_lib_dir_for_target).or_else(|_| check_and_use_lib_dir("PQ_LIB_DIR"))
-- }
-- else{
-- check_and_use_lib_dir("PQ_LIB_DIR")
-- };
--
-- if let Ok(lib_dir) = lib_dir {
-- println!("cargo:rustc-link-search=native={}", lib_dir);
-- } else if configured_by_pkg_config() {
-- return // pkg_config does everything for us, including output for cargo
-- } else if configured_by_vcpkg() {
-- return // vcpkg does everything for us, including output for cargo
-- } else if let Some(path) = pg_config_output("--libdir") {
-- let path = replace_homebrew_path_on_mac(path);
-- println!("cargo:rustc-link-search=native={}", path);
-- }
-- println!("cargo:rustc-link-lib={}", LinkingOptions::from_env());
--}
--
--#[cfg(feature = "pkg-config")]
--fn configured_by_pkg_config() -> bool {
-- pkg_config::probe_library("libpq").is_ok()
--}
--
--#[cfg(not(feature = "pkg-config"))]
--fn configured_by_pkg_config() -> bool {
-- false
--}
--
--#[cfg(target_env = "msvc")]
--fn configured_by_vcpkg() -> bool {
-- vcpkg::find_package("libpq").map(|_| {
-- println!("cargo:rustc-link-lib=crypt32");
-- println!("cargo:rustc-link-lib=gdi32");
-- println!("cargo:rustc-link-lib=user32");
-- println!("cargo:rustc-link-lib=secur32");
-- println!("cargo:rustc-link-lib=shell32");
-- }).is_ok()
--}
--
--#[cfg(not(target_env = "msvc"))]
--fn configured_by_vcpkg() -> bool {
-- false
--}
--
--fn check_and_use_lib_dir(var_name: &str) -> Result<String, env::VarError>{
-- println!("cargo:rerun-if-env-changed={:?}", var_name);
-- println!("{:?} = {:?}", var_name , env::var(var_name));
--
-- let pq_lib_dir = env::var(var_name);
-- if let Ok(pg_lib_path) = pq_lib_dir.clone() {
-- let path = PathBuf::from(&pg_lib_path);
-- if !path.exists() {
-- panic!("Folder {:?} doesn't exist in the configured path: {:?}", var_name, path);
-- }
-- }
-- pq_lib_dir
--}
--
--fn pg_config_path() -> PathBuf {
-- if let Ok(target) = env::var("TARGET") {
-- let pg_config_for_target = &format!("PG_CONFIG_{}", target.to_ascii_uppercase().replace("-", "_"));
-- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
-- if let Some(pg_config_path) = env::var_os(pg_config_for_target) {
--
-- let path = PathBuf::from(&pg_config_path);
--
-- if !path.exists() {
-- panic!("pg_config doesn't exist in the configured path: {:?}", path);
-- }
--
-- return path;
-- }
-- }
-- PathBuf::from("pg_config")
--}
--
--fn pg_config_output(command: &str) -> Option<String> {
-- Command::new(pg_config_path())
-- .arg(command)
-- .output()
-- .ok()
-- .into_iter()
-- .filter(|output| output.status.success())
-- .flat_map(|output| String::from_utf8(output.stdout).ok())
-- .map(|output| output.trim().to_string())
-- .next()
--}
--
--#[cfg(not(target_os = "macos"))]
--fn replace_homebrew_path_on_mac(path: String) -> String {
-- path
--}
--
--#[cfg(target_os = "macos")]
--fn replace_homebrew_path_on_mac(path: String) -> String {
-- if path == "/usr/local/lib" {
-- Command::new("brew")
-- .arg("--prefix")
-- .arg("postgres")
-- .output()
-- .ok()
-- .into_iter()
-- .filter(|output| output.status.success())
-- .flat_map(|output| String::from_utf8(output.stdout).ok())
-- .map(|output| format!("{}/lib", output.trim()))
-- .next()
-- .unwrap_or(path)
-- } else {
-- path
-- }
-+ pkg_config::probe_library("libpq").unwrap();
- }
---
-2.37.1
-
diff --git a/README.md b/README.md
deleted file mode 100644
index d523d27..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-pq-sys
-
-The rust-pq-sys package
\ No newline at end of file
diff --git a/pq-sys-fix-metadata-auto.diff b/pq-sys-fix-metadata-auto.diff
index e85b31f..5d9ba85 100644
--- a/pq-sys-fix-metadata-auto.diff
+++ b/pq-sys-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- pq-sys-0.4.7/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ pq-sys-0.4.7/Cargo.toml 1970-01-01T00:00:01+00:00
-@@ -25,5 +25,3 @@
+--- pq-sys-0.4.8/Cargo.toml 1970-01-01T00:00:01+00:00
++++ pq-sys-0.4.8/Cargo.toml 2023-08-31T20:00:11.068121+00:00
+@@ -26,5 +26,3 @@
version = "0.3.0"
optional = true
diff --git a/pq-sys-fix-metadata.diff b/pq-sys-fix-metadata.diff
index 2336a74..3565041 100644
--- a/pq-sys-fix-metadata.diff
+++ b/pq-sys-fix-metadata.diff
@@ -1,6 +1,6 @@
---- pq-sys-0.4.7/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ pq-sys-0.4.7/Cargo.toml 2022-08-05T15:25:23.988681+00:00
-@@ -23,5 +23,6 @@
+--- pq-sys-0.4.8/Cargo.toml 1970-01-01T00:00:01+00:00
++++ pq-sys-0.4.8/Cargo.toml 2023-08-31T20:00:32.674209+00:00
+@@ -24,5 +24,6 @@
[build-dependencies.pkg-config]
version = "0.3.0"
diff --git a/rust-pq-sys.spec b/rust-pq-sys.spec
index fc640f1..ff44a41 100644
--- a/rust-pq-sys.spec
+++ b/rust-pq-sys.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 24
%ifarch %{ix86} %{arm}
# * generated bindgen tests only work on 64-bit architectures
# https://github.com/sgrif/pq-sys/issues/32
@@ -11,7 +11,7 @@
%global crate pq-sys
Name: rust-pq-sys
-Version: 0.4.7
+Version: 0.4.8
Release: %autorelease
Summary: Auto-generated rust bindings for libpq
@@ -24,9 +24,7 @@ Patch: pq-sys-fix-metadata-auto.diff
# * make build-dependency on pkg-config non-optional
Patch: pq-sys-fix-metadata.diff
# * unconditionally use pkg-config to link against system libpq
-Patch: 0001-unconditionally-use-pkg-config-to-link-against-syste.patch
-
-ExclusiveArch: %{rust_arches}
+Patch: 0001-Unconditionally-use-pkg-config-to-link-against-syste.patch
BuildRequires: rust-packaging >= 21
diff --git a/sources b/sources
index b661c51..fc05ab7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pq-sys-0.4.7.crate) = 26d4c241ce607922b71eca87e753661dc4583b356279cdd3b693c34d8d3eda3cd188aa7f4daa632c4f8785ad7f5a42d58a4ec1fde059d42cc365a411170ef811
+SHA512 (pq-sys-0.4.8.crate) = 5c9c049c2ed2f88a7e910c06bf1f13dc79a86420f57605958dc137d68e7e85cb18429c7c6e0df720e8a106b972a299f499996e91ba258635fd007c1139068f79
https://src.fedoraproject.org/rpms/rust-pq-sys/c/e18876647da357b0a6e0b6ee...
9 months
decathorpe pushed to rpms/rust-webpki (f39). "Update to version
0.22.1; Fixes RHBZ#2236328"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:19:27 UTC
From 4f1b46eeb64d6590ee2da8df04e22774ba7e2a8f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 21:07:07 +0000
Subject: Update to version 0.22.1; Fixes RHBZ#2236328
---
diff --git a/.gitignore b/.gitignore
index be40cb2..1c485ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/webpki-0.21.4.crate
/webpki-0.22.0.crate
+/webpki-0.22.1.crate
diff --git a/rust-webpki.spec b/rust-webpki.spec
index 5478764..637bfe5 100644
--- a/rust-webpki.spec
+++ b/rust-webpki.spec
@@ -1,11 +1,15 @@
# Generated by rust2rpm 24
-%bcond_without check
+# * missing dev-dependencies: rcgen ^0.11.1
+%bcond_with check
%global debug_package %{nil}
%global crate webpki
+# compile and run tests only on supported architectures
+%global supported_arches x86_64 %{ix86} aarch64 %{arm}
+
Name: rust-webpki
-Version: 0.22.0
+Version: 0.22.1
Release: %autorelease
Summary: Web PKI X.509 Certificate Verification
@@ -18,12 +22,9 @@ URL: https://crates.io/crates/webpki
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
# * bump base64 dev-dependency from 0.9 to 0.13
-# * drop profiles that set compiler flags that are incompatible with packaging
+# * specify license with SPDX identifier in crate metadata
Patch: webpki-fix-metadata.diff
-# ring is not available on ppc64le and s390x
-ExcludeArch: ppc64le s390x
-
BuildRequires: rust-packaging >= 21
%global _description %{expand:
@@ -44,7 +45,8 @@ use the "%{crate}" crate.
%license %{crate_instdir}/LICENSE
%doc %{crate_instdir}/README.md
%{crate_instdir}/
-# these files are only used by integration tests
+# exclude integration tests and associated data from installed files
+%exclude %{crate_instdir}/tests/
%exclude %{crate_instdir}/third-party/
%package -n %{name}+default-devel
@@ -91,15 +93,19 @@ use the "std" feature of the "%{crate}" crate.
%cargo_generate_buildrequires
%build
+%ifarch %{supported_arches}
%cargo_build
+%endif
%install
%cargo_install
%if %{with check}
+%ifarch %{supported_arches}
%check
%cargo_test
%endif
+%endif
%changelog
%autochangelog
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..53a9929
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+supported-arches =
+ x86_64
+ %{ix86}
+ aarch64
+ %{arm}
diff --git a/sources b/sources
index ddbefea..493adba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (webpki-0.22.0.crate) = 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
+SHA512 (webpki-0.22.1.crate) = 8af6c45f71cd14c7bc0ae69cd8bbd998da55dadbb0ae0bc6a5fcf2c4f2b6e7aa973750ff6c0def1e876190369ec1113a67e7dca3cb47b64ad6dd2b217694f5e1
diff --git a/webpki-fix-metadata.diff b/webpki-fix-metadata.diff
index a703ea7..6762f83 100644
--- a/webpki-fix-metadata.diff
+++ b/webpki-fix-metadata.diff
@@ -1,33 +1,20 @@
---- webpki-0.22.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ webpki-0.22.0/Cargo.toml 2023-03-18T21:22:36.870752+00:00
-@@ -24,21 +24,6 @@
+--- webpki-0.22.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ webpki-0.22.1/Cargo.toml 2023-08-31T21:05:25.688338+00:00
+@@ -51,7 +51,7 @@
+ "cryptography",
+ "no-std",
+ ]
+-license-file = "LICENSE"
++license = "ISC"
repository = "https://github.com/briansmith/webpki"
- [package.metadata.docs.rs]
- all-features = true
--[profile.bench]
--opt-level = 3
--lto = true
--codegen-units = 1
--debug = false
--debug-assertions = false
--rpath = false
--
--[profile.release]
--opt-level = 3
--lto = true
--codegen-units = 1
--debug = false
--debug-assertions = false
--rpath = false
- [lib]
- name = "webpki"
-@@ -49,7 +34,7 @@
- [dependencies.untrusted]
+ [package.metadata.docs.rs]
+@@ -84,7 +84,7 @@
version = "0.7.1"
+
[dev-dependencies.base64]
-version = "0.9.1"
+version = "0.13"
- [features]
- alloc = ["ring/alloc"]
+ [dev-dependencies.rcgen]
+ version = "0.11.1"
https://src.fedoraproject.org/rpms/rust-webpki/c/4f1b46eeb64d6590ee2da8df...
9 months
decathorpe pushed to rpms/rust-actix (f39). "Update to version
0.13.1; Fixes RHBZ#2236179"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:19:27 UTC
From 606e624b8aa641dd0e6be96ccda47146a5ec1eab Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 20:14:18 +0000
Subject: Update to version 0.13.1; Fixes RHBZ#2236179
---
diff --git a/.gitignore b/.gitignore
index db59f3b..aed0fc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/actix-0.11.1.crate
/actix-0.12.0.crate
/actix-0.13.0.crate
+/actix-0.13.1.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 74cc1e0..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-actix
-
-The rust-actix package
\ No newline at end of file
diff --git a/rust-actix.spec b/rust-actix.spec
index 67a29a2..a7f394a 100644
--- a/rust-actix.spec
+++ b/rust-actix.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 24
# * tests can only be run in-tree
%bcond_with check
%global debug_package %{nil}
@@ -6,7 +6,7 @@
%global crate actix
Name: rust-actix
-Version: 0.13.0
+Version: 0.13.1
Release: %autorelease
Summary: Actor framework for Rust
@@ -14,8 +14,6 @@ License: MIT OR Apache-2.0
URL: https://crates.io/crates/actix
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
BuildRequires: rust-packaging >= 21
%global _description %{expand:
@@ -52,6 +50,18 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+actix-macros-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+actix-macros-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "actix-macros" feature of the "%{crate}" crate.
+
+%files -n %{name}+actix-macros-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%package -n %{name}+actix_derive-devel
Summary: %{summary}
BuildArch: noarch
diff --git a/sources b/sources
index 94ef555..3237065 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (actix-0.13.0.crate) = 407f2da4a9dddfe1a32c1101e884e6c908ff38c3298938741f4b0a820eaf7dfc44e59822345fbff0ba7e8c2e3937cace6330bbfa4fc4375ec7f872ded71c6a0b
+SHA512 (actix-0.13.1.crate) = ca8fac655b80ddddb312f08e6a3b2e9ddf5ece890a15dc88e97ba3c0800348e869d83dc5cf5d5cb0a505c63d5156abc7b47f5760fa20a5284785d2054c4a48c1
https://src.fedoraproject.org/rpms/rust-actix/c/606e624b8aa641dd0e6be96cc...
9 months
decathorpe pushed to rpms/rust-pq-sys (rawhide). "Update to version
0.4.8; Fixes RHBZ#2187760"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:10:58 UTC
From e18876647da357b0a6e0b6ee966f02a15979e8b2 Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 20:05:49 +0000
Subject: Update to version 0.4.8; Fixes RHBZ#2187760
---
diff --git a/.gitignore b/.gitignore
index 33da6d7..990fc63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/pq-sys-0.4.6.crate
/pq-sys-0.4.7.crate
+/pq-sys-0.4.8.crate
diff --git a/0001-Unconditionally-use-pkg-config-to-link-against-syste.patch b/0001-Unconditionally-use-pkg-config-to-link-against-syste.patch
new file mode 100644
index 0000000..54cf32e
--- /dev/null
+++ b/0001-Unconditionally-use-pkg-config-to-link-against-syste.patch
@@ -0,0 +1,216 @@
+From 3b9c72eeb08946147f8a31a12a313ca01b225810 Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe(a)gmail.com>
+Date: Thu, 31 Aug 2023 22:03:55 +0200
+Subject: [PATCH] Unconditionally use pkg-config to link against system libpq
+
+---
+ build.rs | 195 +------------------------------------------------------
+ 1 file changed, 1 insertion(+), 194 deletions(-)
+
+diff --git a/build.rs b/build.rs
+index 2640f27..3a146aa 100644
+--- a/build.rs
++++ b/build.rs
+@@ -1,198 +1,5 @@
+-#[cfg(feature="pkg-config")]
+ extern crate pkg_config;
+
+-#[cfg(target_env = "msvc")]
+-extern crate vcpkg;
+-
+-use std::process::Command;
+-use std::env;
+-use std::path::PathBuf;
+-use std::fmt::{self, Display};
+-
+-enum LinkType {
+- Static,
+- Dynamic
+-}
+-
+-impl Display for LinkType {
+- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+- match *self {
+- LinkType::Static => write!(f, "static"),
+- LinkType::Dynamic => write!(f, "dylib"),
+- }
+- }
+-}
+-
+-struct LinkingOptions {
+- linking_type: Option<LinkType>,
+- lib_name: &'static str,
+-}
+-
+-impl LinkingOptions {
+- fn from_name_and_type(lib_name: &'static str, tpe: LinkType) -> Self {
+- LinkingOptions {
+- linking_type: Some(tpe),
+- lib_name
+- }
+- }
+- fn from_name(lib_name: &'static str) -> Self {
+- LinkingOptions {
+- linking_type: None,
+- lib_name
+- }
+- }
+-
+- fn from_env() -> Self {
+- // On Windows-MSVC, always link dynamically
+- if cfg!(all(windows, target_env="msvc")) {
+- return LinkingOptions::from_name_and_type("libpq", LinkType::Dynamic);
+- }
+-
+- // Link unconditionally statically
+- if env::var_os("PQ_LIB_STATIC").is_some() {
+- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
+- }
+-
+- // Examine the per-target env vars
+- if let Ok(target) = env::var("TARGET") {
+- let pg_config_for_target = format!("PQ_LIB_STATIC_{}", target.to_ascii_uppercase().replace("-", "_"));
+- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
+- if env::var_os(&pg_config_for_target).is_some() {
+- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
+- }
+- }
+-
+- // Otherwise, don't specify
+- LinkingOptions::from_name("pq")
+- }
+-}
+-
+-impl Display for LinkingOptions {
+- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+- if let Some(ref t) = self.linking_type {
+- write!(f, "{}=", t)?;
+- }
+- write!(f, "{}", self.lib_name)
+- }
+-}
+-
+ fn main() {
+- println!("cargo:rerun-if-env-changed=PQ_LIB_STATIC");
+- println!("cargo:rerun-if-env-changed=TARGET");
+-
+- // if target is specified the more concrete pq_lib_dir overwrites a more general one
+- let lib_dir = if let Ok(target) = env::var("TARGET") {
+- let pq_lib_dir_for_target = format!("PQ_LIB_DIR_{}", target.to_ascii_uppercase().replace("-", "_"));
+- check_and_use_lib_dir(&pq_lib_dir_for_target).or_else(|_| check_and_use_lib_dir("PQ_LIB_DIR"))
+- }
+- else{
+- check_and_use_lib_dir("PQ_LIB_DIR")
+- };
+-
+- if let Ok(lib_dir) = lib_dir {
+- println!("cargo:rustc-link-search=native={}", lib_dir);
+- } else if configured_by_pkg_config() {
+- return // pkg_config does everything for us, including output for cargo
+- } else if configured_by_vcpkg() {
+- return // vcpkg does everything for us, including output for cargo
+- } else if let Some(path) = pg_config_output("--libdir") {
+- let path = replace_homebrew_path_on_mac(path);
+- println!("cargo:rustc-link-search=native={}", path);
+- }
+- println!("cargo:rustc-link-lib={}", LinkingOptions::from_env());
+-}
+-
+-#[cfg(feature = "pkg-config")]
+-fn configured_by_pkg_config() -> bool {
+- pkg_config::probe_library("libpq").is_ok()
+-}
+-
+-#[cfg(not(feature = "pkg-config"))]
+-fn configured_by_pkg_config() -> bool {
+- false
+-}
+-
+-#[cfg(target_env = "msvc")]
+-fn configured_by_vcpkg() -> bool {
+- vcpkg::find_package("libpq").map(|_| {
+- println!("cargo:rustc-link-lib=crypt32");
+- println!("cargo:rustc-link-lib=gdi32");
+- println!("cargo:rustc-link-lib=user32");
+- println!("cargo:rustc-link-lib=secur32");
+- println!("cargo:rustc-link-lib=shell32");
+- println!("cargo:rustc-link-lib=wldap32");
+- }).is_ok()
+-}
+-
+-#[cfg(not(target_env = "msvc"))]
+-fn configured_by_vcpkg() -> bool {
+- false
+-}
+-
+-fn check_and_use_lib_dir(var_name: &str) -> Result<String, env::VarError>{
+- println!("cargo:rerun-if-env-changed={:?}", var_name);
+- println!("{:?} = {:?}", var_name , env::var(var_name));
+-
+- let pq_lib_dir = env::var(var_name);
+- if let Ok(pg_lib_path) = pq_lib_dir.clone() {
+- let path = PathBuf::from(&pg_lib_path);
+- if !path.exists() {
+- panic!("Folder {:?} doesn't exist in the configured path: {:?}", var_name, path);
+- }
+- }
+- pq_lib_dir
+-}
+-
+-fn pg_config_path() -> PathBuf {
+- if let Ok(target) = env::var("TARGET") {
+- let pg_config_for_target = &format!("PG_CONFIG_{}", target.to_ascii_uppercase().replace("-", "_"));
+- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
+- if let Some(pg_config_path) = env::var_os(pg_config_for_target) {
+-
+- let path = PathBuf::from(&pg_config_path);
+-
+- if !path.exists() {
+- panic!("pg_config doesn't exist in the configured path: {:?}", path);
+- }
+-
+- return path;
+- }
+- }
+- PathBuf::from("pg_config")
+-}
+-
+-fn pg_config_output(command: &str) -> Option<String> {
+- Command::new(pg_config_path())
+- .arg(command)
+- .output()
+- .ok()
+- .into_iter()
+- .filter(|output| output.status.success())
+- .flat_map(|output| String::from_utf8(output.stdout).ok())
+- .map(|output| output.trim().to_string())
+- .next()
+-}
+-
+-#[cfg(not(target_os = "macos"))]
+-fn replace_homebrew_path_on_mac(path: String) -> String {
+- path
+-}
+-
+-#[cfg(target_os = "macos")]
+-fn replace_homebrew_path_on_mac(path: String) -> String {
+- if path == "/usr/local/lib" {
+- Command::new("brew")
+- .arg("--prefix")
+- .arg("postgres")
+- .output()
+- .ok()
+- .into_iter()
+- .filter(|output| output.status.success())
+- .flat_map(|output| String::from_utf8(output.stdout).ok())
+- .map(|output| format!("{}/lib", output.trim()))
+- .next()
+- .unwrap_or(path)
+- } else {
+- path
+- }
++ pkg_config::probe_library("libpq").unwrap();
+ }
+--
+2.41.0
+
diff --git a/0001-unconditionally-use-pkg-config-to-link-against-syste.patch b/0001-unconditionally-use-pkg-config-to-link-against-syste.patch
deleted file mode 100644
index 133d0fa..0000000
--- a/0001-unconditionally-use-pkg-config-to-link-against-syste.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 6ad894cf364730af4b9c859a9f429e813d29e0e2 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe(a)gmail.com>
-Date: Fri, 5 Aug 2022 17:34:40 +0200
-Subject: [PATCH] unconditionally use pkg-config to link against system libpq
-
----
- build.rs | 194 +------------------------------------------------------
- 1 file changed, 1 insertion(+), 193 deletions(-)
-
-diff --git a/build.rs b/build.rs
-index c8f5a6b..3a146aa 100644
---- a/build.rs
-+++ b/build.rs
-@@ -1,197 +1,5 @@
--#[cfg(feature="pkg-config")]
- extern crate pkg_config;
-
--#[cfg(target_env = "msvc")]
--extern crate vcpkg;
--
--use std::process::Command;
--use std::env;
--use std::path::PathBuf;
--use std::fmt::{self, Display};
--
--enum LinkType {
-- Static,
-- Dynamic
--}
--
--impl Display for LinkType {
-- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-- match *self {
-- LinkType::Static => write!(f, "static"),
-- LinkType::Dynamic => write!(f, "dylib"),
-- }
-- }
--}
--
--struct LinkingOptions {
-- linking_type: Option<LinkType>,
-- lib_name: &'static str,
--}
--
--impl LinkingOptions {
-- fn from_name_and_type(lib_name: &'static str, tpe: LinkType) -> Self {
-- LinkingOptions {
-- linking_type: Some(tpe),
-- lib_name
-- }
-- }
-- fn from_name(lib_name: &'static str) -> Self {
-- LinkingOptions {
-- linking_type: None,
-- lib_name
-- }
-- }
--
-- fn from_env() -> Self {
-- // On Windows-MSVC, always link dynamically
-- if cfg!(all(windows, target_env="msvc")) {
-- return LinkingOptions::from_name_and_type("libpq", LinkType::Dynamic);
-- }
--
-- // Link unconditionally statically
-- if env::var_os("PQ_LIB_STATIC").is_some() {
-- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
-- }
--
-- // Examine the per-target env vars
-- if let Ok(target) = env::var("TARGET") {
-- let pg_config_for_target = format!("PQ_LIB_STATIC_{}", target.to_ascii_uppercase().replace("-", "_"));
-- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
-- if env::var_os(&pg_config_for_target).is_some() {
-- return LinkingOptions::from_name_and_type("pq", LinkType::Static);
-- }
-- }
--
-- // Otherwise, don't specify
-- LinkingOptions::from_name("pq")
-- }
--}
--
--impl Display for LinkingOptions {
-- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-- if let Some(ref t) = self.linking_type {
-- write!(f, "{}=", t)?;
-- }
-- write!(f, "{}", self.lib_name)
-- }
--}
--
- fn main() {
-- println!("cargo:rerun-if-env-changed=PQ_LIB_STATIC");
-- println!("cargo:rerun-if-env-changed=TARGET");
--
-- // if target is specified the more concrete pq_lib_dir overwrites a more general one
-- let lib_dir = if let Ok(target) = env::var("TARGET") {
-- let pq_lib_dir_for_target = format!("PQ_LIB_DIR_{}", target.to_ascii_uppercase().replace("-", "_"));
-- check_and_use_lib_dir(&pq_lib_dir_for_target).or_else(|_| check_and_use_lib_dir("PQ_LIB_DIR"))
-- }
-- else{
-- check_and_use_lib_dir("PQ_LIB_DIR")
-- };
--
-- if let Ok(lib_dir) = lib_dir {
-- println!("cargo:rustc-link-search=native={}", lib_dir);
-- } else if configured_by_pkg_config() {
-- return // pkg_config does everything for us, including output for cargo
-- } else if configured_by_vcpkg() {
-- return // vcpkg does everything for us, including output for cargo
-- } else if let Some(path) = pg_config_output("--libdir") {
-- let path = replace_homebrew_path_on_mac(path);
-- println!("cargo:rustc-link-search=native={}", path);
-- }
-- println!("cargo:rustc-link-lib={}", LinkingOptions::from_env());
--}
--
--#[cfg(feature = "pkg-config")]
--fn configured_by_pkg_config() -> bool {
-- pkg_config::probe_library("libpq").is_ok()
--}
--
--#[cfg(not(feature = "pkg-config"))]
--fn configured_by_pkg_config() -> bool {
-- false
--}
--
--#[cfg(target_env = "msvc")]
--fn configured_by_vcpkg() -> bool {
-- vcpkg::find_package("libpq").map(|_| {
-- println!("cargo:rustc-link-lib=crypt32");
-- println!("cargo:rustc-link-lib=gdi32");
-- println!("cargo:rustc-link-lib=user32");
-- println!("cargo:rustc-link-lib=secur32");
-- println!("cargo:rustc-link-lib=shell32");
-- }).is_ok()
--}
--
--#[cfg(not(target_env = "msvc"))]
--fn configured_by_vcpkg() -> bool {
-- false
--}
--
--fn check_and_use_lib_dir(var_name: &str) -> Result<String, env::VarError>{
-- println!("cargo:rerun-if-env-changed={:?}", var_name);
-- println!("{:?} = {:?}", var_name , env::var(var_name));
--
-- let pq_lib_dir = env::var(var_name);
-- if let Ok(pg_lib_path) = pq_lib_dir.clone() {
-- let path = PathBuf::from(&pg_lib_path);
-- if !path.exists() {
-- panic!("Folder {:?} doesn't exist in the configured path: {:?}", var_name, path);
-- }
-- }
-- pq_lib_dir
--}
--
--fn pg_config_path() -> PathBuf {
-- if let Ok(target) = env::var("TARGET") {
-- let pg_config_for_target = &format!("PG_CONFIG_{}", target.to_ascii_uppercase().replace("-", "_"));
-- println!("cargo:rerun-if-env-changed={}", pg_config_for_target);
-- if let Some(pg_config_path) = env::var_os(pg_config_for_target) {
--
-- let path = PathBuf::from(&pg_config_path);
--
-- if !path.exists() {
-- panic!("pg_config doesn't exist in the configured path: {:?}", path);
-- }
--
-- return path;
-- }
-- }
-- PathBuf::from("pg_config")
--}
--
--fn pg_config_output(command: &str) -> Option<String> {
-- Command::new(pg_config_path())
-- .arg(command)
-- .output()
-- .ok()
-- .into_iter()
-- .filter(|output| output.status.success())
-- .flat_map(|output| String::from_utf8(output.stdout).ok())
-- .map(|output| output.trim().to_string())
-- .next()
--}
--
--#[cfg(not(target_os = "macos"))]
--fn replace_homebrew_path_on_mac(path: String) -> String {
-- path
--}
--
--#[cfg(target_os = "macos")]
--fn replace_homebrew_path_on_mac(path: String) -> String {
-- if path == "/usr/local/lib" {
-- Command::new("brew")
-- .arg("--prefix")
-- .arg("postgres")
-- .output()
-- .ok()
-- .into_iter()
-- .filter(|output| output.status.success())
-- .flat_map(|output| String::from_utf8(output.stdout).ok())
-- .map(|output| format!("{}/lib", output.trim()))
-- .next()
-- .unwrap_or(path)
-- } else {
-- path
-- }
-+ pkg_config::probe_library("libpq").unwrap();
- }
---
-2.37.1
-
diff --git a/README.md b/README.md
deleted file mode 100644
index d523d27..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-pq-sys
-
-The rust-pq-sys package
\ No newline at end of file
diff --git a/pq-sys-fix-metadata-auto.diff b/pq-sys-fix-metadata-auto.diff
index e85b31f..5d9ba85 100644
--- a/pq-sys-fix-metadata-auto.diff
+++ b/pq-sys-fix-metadata-auto.diff
@@ -1,6 +1,6 @@
---- pq-sys-0.4.7/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ pq-sys-0.4.7/Cargo.toml 1970-01-01T00:00:01+00:00
-@@ -25,5 +25,3 @@
+--- pq-sys-0.4.8/Cargo.toml 1970-01-01T00:00:01+00:00
++++ pq-sys-0.4.8/Cargo.toml 2023-08-31T20:00:11.068121+00:00
+@@ -26,5 +26,3 @@
version = "0.3.0"
optional = true
diff --git a/pq-sys-fix-metadata.diff b/pq-sys-fix-metadata.diff
index 2336a74..3565041 100644
--- a/pq-sys-fix-metadata.diff
+++ b/pq-sys-fix-metadata.diff
@@ -1,6 +1,6 @@
---- pq-sys-0.4.7/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ pq-sys-0.4.7/Cargo.toml 2022-08-05T15:25:23.988681+00:00
-@@ -23,5 +23,6 @@
+--- pq-sys-0.4.8/Cargo.toml 1970-01-01T00:00:01+00:00
++++ pq-sys-0.4.8/Cargo.toml 2023-08-31T20:00:32.674209+00:00
+@@ -24,5 +24,6 @@
[build-dependencies.pkg-config]
version = "0.3.0"
diff --git a/rust-pq-sys.spec b/rust-pq-sys.spec
index fc640f1..ff44a41 100644
--- a/rust-pq-sys.spec
+++ b/rust-pq-sys.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 24
%ifarch %{ix86} %{arm}
# * generated bindgen tests only work on 64-bit architectures
# https://github.com/sgrif/pq-sys/issues/32
@@ -11,7 +11,7 @@
%global crate pq-sys
Name: rust-pq-sys
-Version: 0.4.7
+Version: 0.4.8
Release: %autorelease
Summary: Auto-generated rust bindings for libpq
@@ -24,9 +24,7 @@ Patch: pq-sys-fix-metadata-auto.diff
# * make build-dependency on pkg-config non-optional
Patch: pq-sys-fix-metadata.diff
# * unconditionally use pkg-config to link against system libpq
-Patch: 0001-unconditionally-use-pkg-config-to-link-against-syste.patch
-
-ExclusiveArch: %{rust_arches}
+Patch: 0001-Unconditionally-use-pkg-config-to-link-against-syste.patch
BuildRequires: rust-packaging >= 21
diff --git a/sources b/sources
index b661c51..fc05ab7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pq-sys-0.4.7.crate) = 26d4c241ce607922b71eca87e753661dc4583b356279cdd3b693c34d8d3eda3cd188aa7f4daa632c4f8785ad7f5a42d58a4ec1fde059d42cc365a411170ef811
+SHA512 (pq-sys-0.4.8.crate) = 5c9c049c2ed2f88a7e910c06bf1f13dc79a86420f57605958dc137d68e7e85cb18429c7c6e0df720e8a106b972a299f499996e91ba258635fd007c1139068f79
https://src.fedoraproject.org/rpms/rust-pq-sys/c/e18876647da357b0a6e0b6ee...
9 months
decathorpe pushed to rpms/rust-actix (rawhide). "Update to version
0.13.1; Fixes RHBZ#2236179"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:10:57 UTC
From 606e624b8aa641dd0e6be96ccda47146a5ec1eab Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 20:14:18 +0000
Subject: Update to version 0.13.1; Fixes RHBZ#2236179
---
diff --git a/.gitignore b/.gitignore
index db59f3b..aed0fc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/actix-0.11.1.crate
/actix-0.12.0.crate
/actix-0.13.0.crate
+/actix-0.13.1.crate
diff --git a/README.md b/README.md
deleted file mode 100644
index 74cc1e0..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rust-actix
-
-The rust-actix package
\ No newline at end of file
diff --git a/rust-actix.spec b/rust-actix.spec
index 67a29a2..a7f394a 100644
--- a/rust-actix.spec
+++ b/rust-actix.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 22
+# Generated by rust2rpm 24
# * tests can only be run in-tree
%bcond_with check
%global debug_package %{nil}
@@ -6,7 +6,7 @@
%global crate actix
Name: rust-actix
-Version: 0.13.0
+Version: 0.13.1
Release: %autorelease
Summary: Actor framework for Rust
@@ -14,8 +14,6 @@ License: MIT OR Apache-2.0
URL: https://crates.io/crates/actix
Source: %{crates_source}
-ExclusiveArch: %{rust_arches}
-
BuildRequires: rust-packaging >= 21
%global _description %{expand:
@@ -52,6 +50,18 @@ use the "default" feature of the "%{crate}" crate.
%files -n %{name}+default-devel
%ghost %{crate_instdir}/Cargo.toml
+%package -n %{name}+actix-macros-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+actix-macros-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "actix-macros" feature of the "%{crate}" crate.
+
+%files -n %{name}+actix-macros-devel
+%ghost %{crate_instdir}/Cargo.toml
+
%package -n %{name}+actix_derive-devel
Summary: %{summary}
BuildArch: noarch
diff --git a/sources b/sources
index 94ef555..3237065 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (actix-0.13.0.crate) = 407f2da4a9dddfe1a32c1101e884e6c908ff38c3298938741f4b0a820eaf7dfc44e59822345fbff0ba7e8c2e3937cace6330bbfa4fc4375ec7f872ded71c6a0b
+SHA512 (actix-0.13.1.crate) = ca8fac655b80ddddb312f08e6a3b2e9ddf5ece890a15dc88e97ba3c0800348e869d83dc5cf5d5cb0a505c63d5156abc7b47f5760fa20a5284785d2054c4a48c1
https://src.fedoraproject.org/rpms/rust-actix/c/606e624b8aa641dd0e6be96cc...
9 months
decathorpe pushed to rpms/rust-webpki (rawhide). "Update to version
0.22.1; Fixes RHBZ#2236328"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:10:57 UTC
From 4f1b46eeb64d6590ee2da8df04e22774ba7e2a8f Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Aug 31 2023 21:07:07 +0000
Subject: Update to version 0.22.1; Fixes RHBZ#2236328
---
diff --git a/.gitignore b/.gitignore
index be40cb2..1c485ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/webpki-0.21.4.crate
/webpki-0.22.0.crate
+/webpki-0.22.1.crate
diff --git a/rust-webpki.spec b/rust-webpki.spec
index 5478764..637bfe5 100644
--- a/rust-webpki.spec
+++ b/rust-webpki.spec
@@ -1,11 +1,15 @@
# Generated by rust2rpm 24
-%bcond_without check
+# * missing dev-dependencies: rcgen ^0.11.1
+%bcond_with check
%global debug_package %{nil}
%global crate webpki
+# compile and run tests only on supported architectures
+%global supported_arches x86_64 %{ix86} aarch64 %{arm}
+
Name: rust-webpki
-Version: 0.22.0
+Version: 0.22.1
Release: %autorelease
Summary: Web PKI X.509 Certificate Verification
@@ -18,12 +22,9 @@ URL: https://crates.io/crates/webpki
Source: %{crates_source}
# Manually created patch for downstream crate metadata changes
# * bump base64 dev-dependency from 0.9 to 0.13
-# * drop profiles that set compiler flags that are incompatible with packaging
+# * specify license with SPDX identifier in crate metadata
Patch: webpki-fix-metadata.diff
-# ring is not available on ppc64le and s390x
-ExcludeArch: ppc64le s390x
-
BuildRequires: rust-packaging >= 21
%global _description %{expand:
@@ -44,7 +45,8 @@ use the "%{crate}" crate.
%license %{crate_instdir}/LICENSE
%doc %{crate_instdir}/README.md
%{crate_instdir}/
-# these files are only used by integration tests
+# exclude integration tests and associated data from installed files
+%exclude %{crate_instdir}/tests/
%exclude %{crate_instdir}/third-party/
%package -n %{name}+default-devel
@@ -91,15 +93,19 @@ use the "std" feature of the "%{crate}" crate.
%cargo_generate_buildrequires
%build
+%ifarch %{supported_arches}
%cargo_build
+%endif
%install
%cargo_install
%if %{with check}
+%ifarch %{supported_arches}
%check
%cargo_test
%endif
+%endif
%changelog
%autochangelog
diff --git a/rust2rpm.conf b/rust2rpm.conf
new file mode 100644
index 0000000..53a9929
--- /dev/null
+++ b/rust2rpm.conf
@@ -0,0 +1,6 @@
+[DEFAULT]
+supported-arches =
+ x86_64
+ %{ix86}
+ aarch64
+ %{arm}
diff --git a/sources b/sources
index ddbefea..493adba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (webpki-0.22.0.crate) = 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
+SHA512 (webpki-0.22.1.crate) = 8af6c45f71cd14c7bc0ae69cd8bbd998da55dadbb0ae0bc6a5fcf2c4f2b6e7aa973750ff6c0def1e876190369ec1113a67e7dca3cb47b64ad6dd2b217694f5e1
diff --git a/webpki-fix-metadata.diff b/webpki-fix-metadata.diff
index a703ea7..6762f83 100644
--- a/webpki-fix-metadata.diff
+++ b/webpki-fix-metadata.diff
@@ -1,33 +1,20 @@
---- webpki-0.22.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ webpki-0.22.0/Cargo.toml 2023-03-18T21:22:36.870752+00:00
-@@ -24,21 +24,6 @@
+--- webpki-0.22.1/Cargo.toml 1970-01-01T00:00:01+00:00
++++ webpki-0.22.1/Cargo.toml 2023-08-31T21:05:25.688338+00:00
+@@ -51,7 +51,7 @@
+ "cryptography",
+ "no-std",
+ ]
+-license-file = "LICENSE"
++license = "ISC"
repository = "https://github.com/briansmith/webpki"
- [package.metadata.docs.rs]
- all-features = true
--[profile.bench]
--opt-level = 3
--lto = true
--codegen-units = 1
--debug = false
--debug-assertions = false
--rpath = false
--
--[profile.release]
--opt-level = 3
--lto = true
--codegen-units = 1
--debug = false
--debug-assertions = false
--rpath = false
- [lib]
- name = "webpki"
-@@ -49,7 +34,7 @@
- [dependencies.untrusted]
+ [package.metadata.docs.rs]
+@@ -84,7 +84,7 @@
version = "0.7.1"
+
[dev-dependencies.base64]
-version = "0.9.1"
+version = "0.13"
- [features]
- alloc = ["ring/alloc"]
+ [dev-dependencies.rcgen]
+ version = "0.11.1"
https://src.fedoraproject.org/rpms/rust-webpki/c/4f1b46eeb64d6590ee2da8df...
9 months
rathann pushed to rpms/mozilla-ublock-origin (rawhide). "new bundled
dependency: js-beautify"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:00:44 UTC
From 07e5a216eb1209ca11b9ed98e598287f3dcaff27 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik(a)greysector.net>
Date: Aug 31 2023 20:57:40 +0000
Subject: new bundled dependency: js-beautify
---
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index 01845e3..021ba50 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -39,6 +39,8 @@ Provides: bundled(fontawesome-fonts) = 4.7.0
Provides: bundled(inter-fonts)
# css/fonts/Metropolis/Metropolis-*.woff2 https://github.com/chrismsimpson/Metropolis Unlicense
Provides: bundled(metropolis-fonts)
+# lib/js-beautify https://github.com/beautify-web/js-beautify MIT
+Provides: bundled(js-beautify) = 1.14.7
# lib/punycode.js https://mths.be/punycode MIT
Provides: bundled(js-punycode) = 1.3.2
# lib/diff https://github.com/Swatinem/diff LGPLv3
@@ -75,6 +77,7 @@ popd
rm src/{js/wasm,lib/{lz4,publicsuffixlist/wasm}}/*.wasm
mv src/css/fonts/Inter/LICENSE.txt LICENSE.Inter.txt
mv src/img/fontawesome/LICENSE.txt LICENSE.fontawesome.txt
+mv src/lib/js-beautify/LICENSE LICENSE.js-beautify.txt
mv src/lib/codemirror/LICENSE LICENSE.codemirror.txt
%build
@@ -100,6 +103,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%license LICENSE.txt
%license LICENSE.codemirror.txt
%license LICENSE.fontawesome.txt
+%license LICENSE.js-beautify.txt
%license LICENSE.Inter.txt
%license src/css/fonts/Metropolis/UNLICENSE
%{firefox_inst_dir}/%{ext_id}.xpi
@@ -108,6 +112,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
* Thu Aug 31 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.51.0-1
- update to 1.51.0 (#2224682)
+- new bundled dependency: js-beautify
* Mon Jun 12 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.50.0-1
- update to 1.50.0 (#2213457)
https://src.fedoraproject.org/rpms/mozilla-ublock-origin/c/07e5a216eb1209...
9 months
rathann pushed to rpms/mozilla-ublock-origin (rawhide). "update to
1.51.0 (#2224682)"
by notifications＠fedoraproject.org
Notification time stamped 2023-08-31 21:00:44 UTC
From 77e946728711cb871010d9117788bedeb83e3857 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik(a)greysector.net>
Date: Aug 31 2023 20:48:44 +0000
Subject: update to 1.51.0 (#2224682)
---
diff --git a/mozilla-ublock-origin.spec b/mozilla-ublock-origin.spec
index 8cbc85e..01845e3 100644
--- a/mozilla-ublock-origin.spec
+++ b/mozilla-ublock-origin.spec
@@ -6,7 +6,7 @@
%global firefox_inst_dir %{_datadir}/mozilla/extensions/%{firefox_app_id}
Name: mozilla-ublock-origin
-Version: 1.50.0
+Version: 1.51.0
Release: 1%{?dist}
Summary: An efficient blocker for Firefox
@@ -106,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%{_metainfodir}/%{name}.metainfo.xml
%changelog
+* Thu Aug 31 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.51.0-1
+- update to 1.51.0 (#2224682)
+
* Mon Jun 12 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.50.0-1
- update to 1.50.0 (#2213457)
- match upstream build process for uAssets to avoid missing timestamps
diff --git a/sources b/sources
index f7218c7..c8a1db9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (uAssets-1.50.0.tar.gz) = 39a478bdd16924f044c274a8cf8b5e761e77a0521387325a1df210daf9c98e53a99db479d3812f61f92712b5a21fcad5a006ad7e12ceab38eb0e546ca6cabccd
-SHA512 (uBlock-1.50.0.tar.gz) = bde1c632309861205e5108e6d79e7dfa3f23a8634f25f2c7f622db1336f442af52586378446d873347d54d2f445b85dd96e28e2d06aae9b41688be08e771acde
+SHA512 (uAssets-1.51.0.tar.gz) = a42121c19ad086b7c51b4d23aae7c0d3a077200a450bbce76ef510f829f79a13db1c3a885f0338637837141f68795e0d21cf387717c0e8f2aa59039c8daeff5a
+SHA512 (uBlock-1.51.0.tar.gz) = a593fb19263d35423e69bb151cf56c6eb6f10fe16e3f1539820783cc06845c5604f9beb35ae828cdb20fad34127f59b8aec4c77a58edafd25b61d6c5a7b2d6ea
diff --git a/uAssets-mktarball.sh b/uAssets-mktarball.sh
index 10bcfa4..6d80c39 100755
--- a/uAssets-mktarball.sh
+++ b/uAssets-mktarball.sh
@@ -14,8 +14,8 @@ unset CDPATH
pwd=$(pwd)
name=uAssets
version=$(rpmspec -q --qf '%{version}' ./mozilla-ublock-origin.spec)
-commit_master=071cef3879b968973728085576f8fbbe25619567
-commit_gh_pages=5788c6b92447d8211fcd9a3da91e5499c641fb4f
+commit_master=8abf7f8515a27ab8cabb1c1c4a3aeddc84078a25
+commit_gh_pages=e6cfb0f03b682b9927c5e25393c3cf6cc4d3b7e0
url_master=https://github.com/uBlockOrigin/uAssets/archive/${commit_maste...
url_gh_pages=https://github.com/uBlockOrigin/uAssets/archive/${commit_gh_...
pushd "$tmp"
https://src.fedoraproject.org/rpms/mozilla-ublock-origin/c/77e946728711cb...
9 months