Accepting request 1137065 from graphics
- drop update-alternatives for config; use exactly one of configuration package provided OBS-URL: https://build.opensuse.org/request/show/1137065 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ImageMagick?expand=0&rev=287
This commit is contained in:
commit
df7eb25050
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 5 10:49:19 UTC 2024 - pgajdos@suse.com
|
||||||
|
|
||||||
|
- drop update-alternatives for config; use exactly one of configuration
|
||||||
|
package provided
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 3 09:22:56 UTC 2024 - pgajdos@suse.com
|
Wed Jan 3 09:22:56 UTC 2024 - pgajdos@suse.com
|
||||||
|
|
||||||
|
@ -161,39 +161,34 @@ BuildArch: noarch
|
|||||||
%package %{config_spec}-upstream-open
|
%package %{config_spec}-upstream-open
|
||||||
Summary: Open ImageMagick Security Policy
|
Summary: Open ImageMagick Security Policy
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires(post): update-alternatives
|
|
||||||
Requires(postun):update-alternatives
|
|
||||||
Provides: imagick-%{config_spec}
|
Provides: imagick-%{config_spec}
|
||||||
|
Conflicts: otherproviders(imagick-%{config_spec})
|
||||||
Obsoletes: %{config_spec}-upstream < %{version}
|
Obsoletes: %{config_spec}-upstream < %{version}
|
||||||
Provides: %{config_spec}-upstream = %{version}
|
Provides: %{config_spec}-upstream = %{version}
|
||||||
|
|
||||||
%package %{config_spec}-upstream-limited
|
%package %{config_spec}-upstream-limited
|
||||||
Summary: Limited ImageMagick Security Policy
|
Summary: Limited ImageMagick Security Policy
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires(post): update-alternatives
|
|
||||||
Requires(postun):update-alternatives
|
|
||||||
Provides: imagick-%{config_spec}
|
Provides: imagick-%{config_spec}
|
||||||
|
Conflicts: otherproviders(imagick-%{config_spec})
|
||||||
|
|
||||||
%package %{config_spec}-upstream-secure
|
%package %{config_spec}-upstream-secure
|
||||||
Summary: Secure ImageMagick Security Policy
|
Summary: Secure ImageMagick Security Policy
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires(post): update-alternatives
|
|
||||||
Requires(postun):update-alternatives
|
|
||||||
Provides: imagick-%{config_spec}
|
Provides: imagick-%{config_spec}
|
||||||
|
Conflicts: otherproviders(imagick-%{config_spec})
|
||||||
|
|
||||||
%package %{config_spec}-upstream-websafe
|
%package %{config_spec}-upstream-websafe
|
||||||
Summary: Web-safe ImageMagick Security Policy
|
Summary: Web-safe ImageMagick Security Policy
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires(post): update-alternatives
|
|
||||||
Requires(postun):update-alternatives
|
|
||||||
Provides: imagick-%{config_spec}
|
Provides: imagick-%{config_spec}
|
||||||
|
Conflicts: otherproviders(imagick-%{config_spec})
|
||||||
|
|
||||||
%package %{config_spec}-SUSE
|
%package %{config_spec}-SUSE
|
||||||
Summary: SUSE Provided Configuration
|
Summary: SUSE Provided Configuration
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires(post): update-alternatives
|
|
||||||
Requires(postun):update-alternatives
|
|
||||||
Provides: imagick-%{config_spec}
|
Provides: imagick-%{config_spec}
|
||||||
|
Conflicts: otherproviders(imagick-%{config_spec})
|
||||||
|
|
||||||
%description
|
%description
|
||||||
ImageMagick is a robust collection of tools and libraries to read,
|
ImageMagick is a robust collection of tools and libraries to read,
|
||||||
@ -487,90 +482,6 @@ sed -i 's:%{buildroot}::' %{buildroot}/%{_libdir}/ImageMagick-%{mfr_version}/con
|
|||||||
%post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
|
%post -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
|
||||||
%postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
|
%postun -n libMagick++%{libspec}%{cxxlibver} -p /sbin/ldconfig
|
||||||
|
|
||||||
%post %{config_spec}-upstream-open
|
|
||||||
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-open 1
|
|
||||||
|
|
||||||
%postun %{config_spec}-upstream-open
|
|
||||||
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
|
|
||||||
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream
|
|
||||||
fi
|
|
||||||
|
|
||||||
%post %{config_spec}-upstream-limited
|
|
||||||
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-limited 5
|
|
||||||
|
|
||||||
%postun %{config_spec}-upstream-limited
|
|
||||||
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
|
|
||||||
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-limited
|
|
||||||
fi
|
|
||||||
|
|
||||||
%post %{config_spec}-upstream-secure
|
|
||||||
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-secure 10
|
|
||||||
|
|
||||||
%postun %{config_spec}-upstream-secure
|
|
||||||
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
|
|
||||||
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-secure
|
|
||||||
fi
|
|
||||||
|
|
||||||
%pretrans %{config_spec}-upstream-open -p <lua>
|
|
||||||
-- this %pretrans to be removed soon [bug#1122033#c37]
|
|
||||||
path = "%{_sysconfdir}/%{config_dir}"
|
|
||||||
st = posix.stat(path)
|
|
||||||
if st and st.type == "directory" then
|
|
||||||
os.remove(path .. ".rpmmoved")
|
|
||||||
os.rename(path, path .. ".rpmmoved")
|
|
||||||
end
|
|
||||||
|
|
||||||
%pretrans %{config_spec}-upstream-limited -p <lua>
|
|
||||||
-- this %pretrans to be removed soon [bug#1122033#c37]
|
|
||||||
path = "%{_sysconfdir}/%{config_dir}"
|
|
||||||
st = posix.stat(path)
|
|
||||||
if st and st.type == "directory" then
|
|
||||||
os.remove(path .. ".rpmmoved")
|
|
||||||
os.rename(path, path .. ".rpmmoved")
|
|
||||||
end
|
|
||||||
%pretrans %{config_spec}-upstream-secure -p <lua>
|
|
||||||
-- this %pretrans to be removed soon [bug#1122033#c37]
|
|
||||||
path = "%{_sysconfdir}/%{config_dir}"
|
|
||||||
st = posix.stat(path)
|
|
||||||
if st and st.type == "directory" then
|
|
||||||
os.remove(path .. ".rpmmoved")
|
|
||||||
os.rename(path, path .. ".rpmmoved")
|
|
||||||
end
|
|
||||||
|
|
||||||
%pretrans %{config_spec}-SUSE -p <lua>
|
|
||||||
-- this %pretrans to be removed soon [bug#1122033#c37]
|
|
||||||
path = "%{_sysconfdir}/%{config_dir}"
|
|
||||||
st = posix.stat(path)
|
|
||||||
if st and st.type == "directory" then
|
|
||||||
os.remove(path .. ".rpmmoved")
|
|
||||||
os.rename(path, path .. ".rpmmoved")
|
|
||||||
end
|
|
||||||
|
|
||||||
%pretrans %{config_spec}-upstream-websafe -p <lua>
|
|
||||||
-- this %pretrans to be removed soon [bug#1122033#c37]
|
|
||||||
path = "%{_sysconfdir}/%{config_dir}"
|
|
||||||
st = posix.stat(path)
|
|
||||||
if st and st.type == "directory" then
|
|
||||||
os.remove(path .. ".rpmmoved")
|
|
||||||
os.rename(path, path .. ".rpmmoved")
|
|
||||||
end
|
|
||||||
|
|
||||||
%post %{config_spec}-SUSE
|
|
||||||
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-SUSE 15
|
|
||||||
|
|
||||||
%postun %{config_spec}-SUSE
|
|
||||||
if [ ! -d %{_sysconfdir}/%{config_dir}-SUSE ] ; then
|
|
||||||
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-SUSE
|
|
||||||
fi
|
|
||||||
|
|
||||||
%post %{config_spec}-upstream-websafe
|
|
||||||
%{_sbindir}/update-alternatives --quiet --install %{_sysconfdir}/%{config_dir} %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-websafe 20
|
|
||||||
|
|
||||||
%postun %{config_spec}-upstream-websafe
|
|
||||||
if [ ! -d %{_sysconfdir}/%{config_dir}-upstream ] ; then
|
|
||||||
%{_sbindir}/update-alternatives --quiet --remove %{config_dir} %{_sysconfdir}/%{config_dir}-upstream-websafe
|
|
||||||
fi
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%doc NEWS.txt
|
%doc NEWS.txt
|
||||||
|
Loading…
x
Reference in New Issue
Block a user