Hello community, here is the log from the commit of package hdparm for openSUSE:Factory checked in at 2020-12-02 13:57:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdparm (Old) and /work/SRC/openSUSE:Factory/.hdparm.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hdparm" Wed Dec 2 13:57:47 2020 rev:73 rq:851933 version:9.58 Changes: -------- --- /work/SRC/openSUSE:Factory/hdparm/hdparm.changes 2019-02-24 16:58:05.812831672 +0100 +++ /work/SRC/openSUSE:Factory/.hdparm.new.5913/hdparm.changes 2020-12-02 13:57:48.745775283 +0100 @@ -1,0 +2,5 @@ +Thu Nov 26 09:41:02 UTC 2020 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdparm.spec ++++++ --- /var/tmp/diff_new_pack.O1C4CQ/_old 2020-12-02 13:57:49.397775970 +0100 +++ /var/tmp/diff_new_pack.O1C4CQ/_new 2020-12-02 13:57:49.405775978 +0100 @@ -1,7 +1,7 @@ # # spec file for package hdparm # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Summary: A Program to get and set hard disk parameters License: SUSE-Permissive Group: Hardware/Other -Url: http://sourceforge.net/projects/hdparm/ +URL: http://sourceforge.net/projects/hdparm/ Source: http://downloads.sf.net/hdparm/%{name}-%{version}.tar.gz Patch1: hdparm-nostrip.patch Patch2: hdparm-wiper-warn.patch @@ -57,19 +57,19 @@ install -m 755 contrib/idectl "%{buildroot}%{_libexecdir}/hdparm" install -m 755 contrib/ultrabayd "%{buildroot}%{_libexecdir}/hdparm" install -m 755 wiper/wiper.sh "%{buildroot}/%{_sbindir}" -#UsrMerge +%if !0%{?usrmerged} mkdir -p "%{buildroot}/sbin" ln -sf %{_sbindir}/wiper.sh "%{buildroot}/sbin" ln -sf %{_sbindir}/hdparm "%{buildroot}/sbin" -#EndUsrMerge +%endif %files %doc Changelog README.acoustic contrib/README.contrib README.wiper %{_mandir}/man8/hdparm.8%{?ext_man} -#UsrMerge +%if !0%{?usrmerged} /sbin/hdparm /sbin/wiper.sh -#EndUserMerge +%endif %{_sbindir}/hdparm %{_sbindir}/wiper.sh %{_libexecdir}/hdparm _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
