From 20f67d7d64344f4a993c27d267933011a5331d839e5e083d702302e1f5f64769 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 25 Feb 2024 23:13:44 +0000 Subject: [PATCH 1/5] use just optflags OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=40 --- debian.changelog | 2 +- debian.control | 4 ++-- debian.rules | 2 +- libvmime.dsc | 2 +- libvmime.spec | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian.changelog b/debian.changelog index 5e808bc..29d6341 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -libvmime (0.9.2+g188-0) unstable; urgency=low +libvmime (0.9.2.188-0) unstable; urgency=low * Initial package. diff --git a/debian.control b/debian.control index 84bf8ec..25b571f 100644 --- a/debian.control +++ b/debian.control @@ -5,7 +5,7 @@ Maintainer: openSUSE Standards-Version: 4.5.0 Build-Depends: debhelper-compat (= 12) -Package: libvmime-suse5 +Package: libvmime-suse6 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} Description: Library for working with MIME messages and IMAP/POP/SMTP @@ -13,7 +13,7 @@ Description: Library for working with MIME messages and IMAP/POP/SMTP Package: libvmime-dev Architecture: any -Depends: ${misc:Depends}, libvmime-suse5 (= ${binary:Version}), +Depends: ${misc:Depends}, libvmime-suse6 (= ${binary:Version}), libgsasl-dev | libgsasl7-dev, libgnutls28-dev Description: Development files for vmime, an e-mail message library . diff --git a/debian.rules b/debian.rules index 34f3422..bc03ae1 100644 --- a/debian.rules +++ b/debian.rules @@ -9,7 +9,7 @@ override_dh_auto_configure: cmake \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_INSTALL_LIBDIR:PATH="/usr/lib/${DEB_HOST_MULTIARCH}" \ - -DVMIME_SENDMAIL_PATH:STRING="/usr/sbin/sendmail" + -DVMIME_SENDMAIL_PATH:STRING="/usr/sbin/sendmail" \ -DVMIME_BUILD_SAMPLES:BOOL=OFF \ -DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ diff --git a/libvmime.dsc b/libvmime.dsc index 1b7f6cc..46bcc89 100644 --- a/libvmime.dsc +++ b/libvmime.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: libvmime Architecture: any -Version: 0.9.2+g188 +Version: 0.9.2.188 DEBTRANSFORM-RELEASE: 1 Maintainer: openSUSE Homepage: https://opensuse.org/ diff --git a/libvmime.spec b/libvmime.spec index 13567a4..757bd25 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -112,10 +112,10 @@ popd -DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="$cf" \ - -DCMAKE_CXX_FLAGS:STRING="%{?redhat_version:-fPIC} %{?almalinux_version:-fPIC}" \ - -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="$cf" \ - -DCMAKE_C_FLAGS:STRING="%{?redhat_version:-fPIC} %{?almalinux_version:-fPIC}" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflasgs" \ + -DCMAKE_CXX_FLAGS:STRING="%optflasgs" \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags" \ + -DCMAKE_C_FLAGS:STRING="%optflags" \ -DVMIME_BUILD_DOCUMENTATION:BOOL=OFF %cmake_build From e16221bf5949c034dfe96df30c224ede440ca4fef13098450cab834e768299cb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 25 Feb 2024 23:15:30 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=41 --- libvmime.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvmime.spec b/libvmime.spec index 757bd25..0c93f97 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -112,8 +112,8 @@ popd -DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ -DCMAKE_BUILD_TYPE:STRING="RelWithDebInfo" \ - -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflasgs" \ - -DCMAKE_CXX_FLAGS:STRING="%optflasgs" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="%optflags" \ + -DCMAKE_CXX_FLAGS:STRING="%optflags" \ -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="%optflags" \ -DCMAKE_C_FLAGS:STRING="%optflags" \ -DVMIME_BUILD_DOCUMENTATION:BOOL=OFF From 389480cb0396368fc1d6b186c9d35a3ced560cf82494d263fb6c48683967aac1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 25 Feb 2024 23:24:58 +0000 Subject: [PATCH 3/5] remove old constructs OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=42 --- libvmime.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvmime.spec b/libvmime.spec index 0c93f97..a8a8087 100644 --- a/libvmime.spec +++ b/libvmime.spec @@ -31,7 +31,7 @@ Patch1: libvmime-nodatetime.diff Patch2: libvmime-soname.diff BuildRequires: cmake >= 2.8.3 BuildRequires: gcc-c++ -%if 0%{?centos_version} +%if 0%{?rhel} || 0%{?fedora_version} BuildRequires: gnutls-devel %else BuildRequires: libgnutls-devel @@ -127,8 +127,6 @@ cp -a doc/book/book.pdf "$b/%_docdir/%name/" %endif %cmake_install find "$b" -type f -name "*.la" -delete -mkdir -p "$b/%_datadir" -#mv "$b/%_prefix/cmake" "$b/%_datadir/" %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig From 508c2b562a98970358c1c1138219717846c8e0ab77b1a5b52f3b5ccb6dcacbfe Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 25 Feb 2024 23:34:33 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=43 --- debian.changelog | 2 +- libvmime.dsc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.changelog b/debian.changelog index 29d6341..5e808bc 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -libvmime (0.9.2.188-0) unstable; urgency=low +libvmime (0.9.2+g188-0) unstable; urgency=low * Initial package. diff --git a/libvmime.dsc b/libvmime.dsc index 46bcc89..1b7f6cc 100644 --- a/libvmime.dsc +++ b/libvmime.dsc @@ -1,7 +1,7 @@ Format: 1.0 Source: libvmime Architecture: any -Version: 0.9.2.188 +Version: 0.9.2+g188 DEBTRANSFORM-RELEASE: 1 Maintainer: openSUSE Homepage: https://opensuse.org/ From 358c4cc3622ed26ae611b41ce7c231616c821276b575bdd3e1242878e6ec327f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 25 Feb 2024 23:53:02 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/server:mail/libvmime?expand=0&rev=44 --- libvmime.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvmime.changes b/libvmime.changes index 1e1af17..e94b103 100644 --- a/libvmime.changes +++ b/libvmime.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 25 23:52:52 UTC 2024 - Jan Engelhardt + +- Reinstate %optflags + ------------------------------------------------------------------- Sun Dec 31 16:19:00 UTC 2023 - Jan Engelhardt