Hello community, here is the log from the commit of package vlan for openSUSE:Factory checked in at 2020-12-08 13:24:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlan (Old) and /work/SRC/openSUSE:Factory/.vlan.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vlan" Tue Dec 8 13:24:02 2020 rev:19 rq:853305 version:1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/vlan/vlan.changes 2014-09-28 19:58:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vlan.new.5913/vlan.changes 2020-12-08 13:25:35.526707892 +0100 @@ -1,0 +2,5 @@ +Wed Nov 4 16:58:10 UTC 2020 - Ludwig Nussel <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlan.spec ++++++ --- /var/tmp/diff_new_pack.pd6vVH/_old 2020-12-08 13:25:36.010709272 +0100 +++ /var/tmp/diff_new_pack.pd6vVH/_new 2020-12-08 13:25:36.010709272 +0100 @@ -1,7 +1,7 @@ # # spec file for package vlan # -# Copyright (c) 2014 SUSE LINUX Products 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 @@ -12,17 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: vlan BuildRequires: gcc-c++ -Url: http://www.candelatech.com/~greear/vlan.html +URL: http://www.candelatech.com/~greear/vlan.html Version: 1.9 Release: 0 Summary: 802.1q VLAN Implementation for Linux -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Other Source: http://www.candelatech.com/~greear/vlan/vlan.%{version}.tar.bz2 Source1: http://scry.wanfear.com/~greear/vlan/cisco_howto.html.bz2 @@ -51,17 +51,17 @@ mkdir -p $RPM_BUILD_ROOT/{sbin,%_sbindir,%{_mandir}/man8/} install -m755 vconfig $RPM_BUILD_ROOT/%_sbindir install -m644 vconfig.8 $RPM_BUILD_ROOT%{_mandir}/man8/ -#UsrMerge +%if !0%{?usrmerged} ln -sf %_sbindir/vconfig $RPM_BUILD_ROOT/sbin -#EndUsrMerge +%endif %files %defattr(644,root,root,755) %doc *.html *.pl CHANGELOG README %doc %{_mandir}/man8/vconfig.8.gz %attr(755,root,root) %_sbindir/vconfig -#UsrMerge +%if !0%{?usrmerged} %attr(755,root,root) /sbin/vconfig -#EndUsrMerge +%endif %changelog _______________________________________________ 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]
