From c9677b77151a2d7b23977efe3b862c28ecbe29f438efff1bf242c75d55b2e9cc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 7 Nov 2023 10:33:55 +0000 Subject: [PATCH] Accepting request 1123531 from home:dimstar:Factory - Fix build with RPM 4.19: unnumbered patches are no longer supported. - Add _multibuild to define 2nd spec file as additional flavor. Eliminates the need for source package links in OBS. - drop optional opie dependency - Fix build with RPM 4.19: unnumbered patches are no longer supported. - Add _multibuild to define 2nd spec file as additional flavor. Eliminates the need for source package links in OBS. - drop optional opie dependency - Do not set directories inside doc/ mode 644; otherwise the directories are set 644 as well, which means no files inside are accessible. This resulted in the past in doc/ actually not being added to the devel package. - Fix build with RPM 4.19: unnumbered patches are no longer supported. - Add _multibuild to define 2nd spec file as additional flavor. Eliminates the need for source package links in OBS. - drop optional opie dependency - Do not set directories inside doc/ mode 644; otherwise the OBS-URL: https://build.opensuse.org/request/show/1123531 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=104 --- cyrus-sasl-bdb.changes | 17 +++++++++++++++++ cyrus-sasl-bdb.spec | 4 ++-- cyrus-sasl-saslauthd-bdb.changes | 25 +++++++++++++++++++++++++ cyrus-sasl-saslauthd-bdb.spec | 4 ++-- cyrus-sasl-saslauthd.changes | 25 +++++++++++++++++++++++++ cyrus-sasl-saslauthd.spec | 4 ++-- cyrus-sasl.changes | 6 ++++++ 7 files changed, 79 insertions(+), 6 deletions(-) diff --git a/cyrus-sasl-bdb.changes b/cyrus-sasl-bdb.changes index a152231..abe9564 100644 --- a/cyrus-sasl-bdb.changes +++ b/cyrus-sasl-bdb.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Nov 6 09:03:23 UTC 2023 - Dominique Leuenberger + +- Fix build with RPM 4.19: unnumbered patches are no longer + supported. + +------------------------------------------------------------------- +Thu May 4 11:21:19 UTC 2023 - Dominique Leuenberger + +- Add _multibuild to define 2nd spec file as additional flavor. + Eliminates the need for source package links in OBS. + +------------------------------------------------------------------- +Mon Jan 23 20:35:54 UTC 2023 - Dirk Müller + +- drop optional opie dependency + ------------------------------------------------------------------- Wed Dec 7 11:15:12 UTC 2022 - Dominique Leuenberger diff --git a/cyrus-sasl-bdb.spec b/cyrus-sasl-bdb.spec index fa9cb97..064f632 100644 --- a/cyrus-sasl-bdb.spec +++ b/cyrus-sasl-bdb.spec @@ -28,7 +28,7 @@ Source: https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus- Source1: cyrus-sasl-rc.tar.bz2 Source2: README.Source Source3: baselibs.conf -Patch: cyrus-sasl.dif +Patch0: cyrus-sasl.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix_libpq-fe_include.diff @@ -161,7 +161,7 @@ then echo "dlcompat contains potential legal risks." rm -rf %{_builddir}/cyrus-sasl-%{version}/dlcompat-* fi -%patch +%patch0 %patch5 -p1 %patch6 -p1 %patch7 -p1 diff --git a/cyrus-sasl-saslauthd-bdb.changes b/cyrus-sasl-saslauthd-bdb.changes index 47b9157..abe9564 100644 --- a/cyrus-sasl-saslauthd-bdb.changes +++ b/cyrus-sasl-saslauthd-bdb.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Nov 6 09:03:23 UTC 2023 - Dominique Leuenberger + +- Fix build with RPM 4.19: unnumbered patches are no longer + supported. + +------------------------------------------------------------------- +Thu May 4 11:21:19 UTC 2023 - Dominique Leuenberger + +- Add _multibuild to define 2nd spec file as additional flavor. + Eliminates the need for source package links in OBS. + +------------------------------------------------------------------- +Mon Jan 23 20:35:54 UTC 2023 - Dirk Müller + +- drop optional opie dependency + +------------------------------------------------------------------- +Wed Dec 7 11:15:12 UTC 2022 - Dominique Leuenberger + +- Do not set directories inside doc/ mode 644; otherwise the + directories are set 644 as well, which means no files inside are + accessible. This resulted in the past in doc/ actually not being + added to the devel package. + ------------------------------------------------------------------- Wed Mar 9 08:39:23 UTC 2022 - Dirk Müller diff --git a/cyrus-sasl-saslauthd-bdb.spec b/cyrus-sasl-saslauthd-bdb.spec index defd4f5..4274148 100644 --- a/cyrus-sasl-saslauthd-bdb.spec +++ b/cyrus-sasl-saslauthd-bdb.spec @@ -33,7 +33,7 @@ Source1: cyrus-sasl-rc.tar.bz2 Source2: README.Source Source3: baselibs.conf Source4: saslauthd.service -Patch: cyrus-sasl.dif +Patch0: cyrus-sasl.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix_libpq-fe_include.diff @@ -75,7 +75,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %prep %setup -n cyrus-sasl-%{version} -a 1 -%patch +%patch0 %patch5 -p1 %patch6 -p1 %patch7 -p1 diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index 47b9157..abe9564 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Nov 6 09:03:23 UTC 2023 - Dominique Leuenberger + +- Fix build with RPM 4.19: unnumbered patches are no longer + supported. + +------------------------------------------------------------------- +Thu May 4 11:21:19 UTC 2023 - Dominique Leuenberger + +- Add _multibuild to define 2nd spec file as additional flavor. + Eliminates the need for source package links in OBS. + +------------------------------------------------------------------- +Mon Jan 23 20:35:54 UTC 2023 - Dirk Müller + +- drop optional opie dependency + +------------------------------------------------------------------- +Wed Dec 7 11:15:12 UTC 2022 - Dominique Leuenberger + +- Do not set directories inside doc/ mode 644; otherwise the + directories are set 644 as well, which means no files inside are + accessible. This resulted in the past in doc/ actually not being + added to the devel package. + ------------------------------------------------------------------- Wed Mar 9 08:39:23 UTC 2022 - Dirk Müller diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 34589be..f2a57d8 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.spec @@ -33,7 +33,7 @@ Source1: cyrus-sasl-rc.tar.bz2 Source2: README.Source Source3: baselibs.conf Source4: saslauthd.service -Patch: cyrus-sasl.dif +Patch0: cyrus-sasl.dif Patch5: cyrus-sasl-no_rpath.patch Patch6: cyrus-sasl-lfs.patch Patch7: fix_libpq-fe_include.diff @@ -75,7 +75,7 @@ The SQL auxprop plugin supports PostgreSQL and MySQL %prep %setup -n cyrus-sasl-%{version} -a 1 -%patch +%patch0 %patch5 -p1 %patch6 -p1 %patch7 -p1 diff --git a/cyrus-sasl.changes b/cyrus-sasl.changes index d03700b..abe9564 100644 --- a/cyrus-sasl.changes +++ b/cyrus-sasl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 6 09:03:23 UTC 2023 - Dominique Leuenberger + +- Fix build with RPM 4.19: unnumbered patches are no longer + supported. + ------------------------------------------------------------------- Thu May 4 11:21:19 UTC 2023 - Dominique Leuenberger