commit i4l-base for openSUSE:Factory
Hello community, here is the log from the commit of package i4l-base for openSUSE:Factory checked in at 2012-10-23 19:37:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i4l-base (Old) and /work/SRC/openSUSE:Factory/.i4l-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "i4l-base", Maintainer is "orphaned@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/i4l-base/i4l-base.changes 2012-09-20 15:48:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.i4l-base.new/i4l-base.changes 2012-10-23 19:37:58.000000000 +0200 @@ -0,0 +1,17 @@ +Thu Oct 18 16:28:46 UTC 2012 - max@suse.com + +- Make SuSEconfig.isdn a standalone script and rename/move it to + /etc/sysconfig/isdn/scripts/postprocess.isdn . +- Move the MODIFY_SECRETS variable from /etc/sysconfig/suseconfig + to the new /etc/sysconfig/isdn file. +- Add divactrl_2.1-dialog.patch to keep the precompiled dialog + binary from getting installed under /usr/share. +- Add i4l-base-rpmlintrc to silence false positive + devel-file-in-non-devel-package errors. + +------------------------------------------------------------------- +Mon Oct 8 14:06:36 UTC 2012 - aj@suse.de + +- Use tmpfiles.d instead of obsolete /lib/udev/devices for static + device nodes + New: ---- divactrl_2.1-dialog.patch i4l-base-postprocess i4l-base-rpmlintrc i4l-base-sysconfig i4l.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i4l-base.spec ++++++ --- /var/tmp/diff_new_pack.eJAXmi/_old 2012-10-23 19:38:05.000000000 +0200 +++ /var/tmp/diff_new_pack.eJAXmi/_new 2012-10-23 19:38:05.000000000 +0200 @@ -51,6 +51,9 @@ Source4: 45-isdn.rules Source5: isdn.sh Source6: baselibs.conf +Source7: i4l.conf +Source8: i4l-base-postprocess +Source9: i4l-base-sysconfig Patch: isdn4k-utils.dif Patch1: capi20_fixes.diff Patch4: arm-fix-va_arg-usage.diff @@ -62,9 +65,13 @@ #Patch10: i4l_suse-auto.diff Patch34: vboxbeep-pie.patch Patch35: isdnctrl-pie.patch +Patch36: divactrl_2.1-dialog.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: /bin/cat fileutils %fillup_prereq +PreReq: /bin/cat +PreReq: fileutils +PreReq: %fillup_prereq PreReq: permissions +PreReq: systemd #Excludearch: s390 s390x %define _xorg7_prefix /usr %define _xorg7_app /usr/share @@ -212,9 +219,12 @@ %patch31 -p1 %patch32 -p1 %patch33 -p0 -cd ../i4l_suse +%patch36 +popd +pushd ../i4l_suse %patch11 -p1 %patch12 -p0 +popd %build # This package failed when testing with -Wl,-as-needed being default. @@ -328,7 +338,7 @@ # i4l_suse.tar.bz2 cd ../i4l_suse install -d $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 755 templates/* $RPM_BUILD_ROOT/var/adm/fillup-templates +install -m 755 %{S:9} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.i4l-base install -d $RPM_BUILD_ROOT/etc/xinetd.d install -m 644 etc/xinetd.d/i4l-vbox $RPM_BUILD_ROOT/etc/xinetd.d install -p -m 755 bin/isdnmon $RPM_BUILD_ROOT/usr/bin @@ -356,8 +366,8 @@ ######## /etc/logrotate.d ############ install -d $RPM_BUILD_ROOT/etc/logrotate.d install -p -m 644 etc/logrotate.d/* $RPM_BUILD_ROOT/etc/logrotate.d -######## SuSEconfig.isdn ############# -install -p -m 755 sbin/conf.d/* $RPM_BUILD_ROOT/sbin/conf.d/ +######## postprocess.isdn ############# +install -p -m 755 %{S:8} $RPM_BUILD_ROOT/etc/sysconfig/isdn/scripts/postprocess.isdn ###### rc links ###### ln -sf ../../etc/init.d/isdn $RPM_BUILD_ROOT/usr/sbin/rcisdn ###### sysconfig links ###### @@ -440,8 +450,8 @@ # udev/hotplug stuff install -m644 -D %{S:4} $RPM_BUILD_ROOT/etc/udev/rules.d/45-isdn.rules install -m755 -D %{S:5} $RPM_BUILD_ROOT/lib/udev/isdn.sh -install -d $RPM_BUILD_ROOT/lib/udev/devices -ln -sn isdnctrl0 $RPM_BUILD_ROOT/lib/udev/devices/isdnctrl +mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d +install -m644 %{S:7} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d rm -f $RPM_BUILD_ROOT/dev/isdnctrl rm -f "%buildroot/%_libdir"/*.la %find_lang ant-phone @@ -468,17 +478,22 @@ minor=${line##*.} # # create missing legacy devices -cd lib/udev/devices -for dev in *; do - if [ -e /dev -a ! -e /dev/${dev} ]; then - cp -u -a ${dev} /dev/ - fi -done -cd ../../../ +systemd-tmpfiles --create /usr/lib/tmpfiles.d/i4l.conf # -# remove old var from rc.config -# %{remove_and_set I4L_START} -%{fillup_only -an suseconfig} +# Move MODIFY_SECRETS from /etc/sysconfig/suseconfig +# to /etc/sysconfig/i4l-base +# +set -x +SC=/etc/sysconfig/suseconfig +FT=/var/adm/fillup-templates/sysconfig.i4l-base +if test -f $SC; then + fillup -i $SC $FT /etc/sysconfig/i4l-base + fillup -r $SC $FT $SC + mv $SC.new $SC +fi + +%fillup_only + %set_permissions /sbin/isdnctrl exit 0 @@ -511,7 +526,7 @@ %files -f isdnctrl_conf_timru %defattr(-,root,root) -/var/adm/fillup-templates/sysconfig.suseconfig-i4l-base +/var/adm/fillup-templates/sysconfig.i4l-base ### /etc/isdn %dir /etc/isdn ### /etc/ppp @@ -553,57 +568,7 @@ ### udev devices %dir /lib/udev /lib/udev/isdn.sh -%dir /lib/udev/devices -/lib/udev/devices/isdnctrl -%attr(600,root,uucp) %dev(c,45,128) /lib/udev/devices/ippp0 -%attr(600,root,uucp) %dev(c,45,129) /lib/udev/devices/ippp1 -%attr(600,root,uucp) %dev(c,45,130) /lib/udev/devices/ippp2 -%attr(600,root,uucp) %dev(c,45,131) /lib/udev/devices/ippp3 -%attr(600,root,uucp) %dev(c,45,132) /lib/udev/devices/ippp4 -%attr(600,root,uucp) %dev(c,45,133) /lib/udev/devices/ippp5 -%attr(600,root,uucp) %dev(c,45,134) /lib/udev/devices/ippp6 -%attr(600,root,uucp) %dev(c,45,135) /lib/udev/devices/ippp7 -%attr(600,root,uucp) %dev(c,45,136) /lib/udev/devices/ippp8 -%attr(600,root,uucp) %dev(c,45,137) /lib/udev/devices/ippp9 -%attr(600,root,uucp) %dev(c,45,138) /lib/udev/devices/ippp10 -%attr(600,root,uucp) %dev(c,45,139) /lib/udev/devices/ippp11 -%attr(600,root,uucp) %dev(c,45,140) /lib/udev/devices/ippp12 -%attr(600,root,uucp) %dev(c,45,141) /lib/udev/devices/ippp13 -%attr(600,root,uucp) %dev(c,45,142) /lib/udev/devices/ippp14 -%attr(600,root,uucp) %dev(c,45,143) /lib/udev/devices/ippp15 -%attr(644,root,uucp) %dev(c,45,255) /lib/udev/devices/isdninfo -%attr(600,root,uucp) %dev(c,45,64) /lib/udev/devices/isdnctrl0 -%attr(600,root,uucp) %dev(c,45,65) /lib/udev/devices/isdnctrl1 -%attr(600,root,uucp) %dev(c,45,66) /lib/udev/devices/isdnctrl2 -%attr(600,root,uucp) %dev(c,45,67) /lib/udev/devices/isdnctrl3 -%attr(600,root,uucp) %dev(c,45,68) /lib/udev/devices/isdnctrl4 -%attr(600,root,uucp) %dev(c,45,69) /lib/udev/devices/isdnctrl5 -%attr(600,root,uucp) %dev(c,45,70) /lib/udev/devices/isdnctrl6 -%attr(600,root,uucp) %dev(c,45,71) /lib/udev/devices/isdnctrl7 -%attr(600,root,uucp) %dev(c,45,72) /lib/udev/devices/isdnctrl8 -%attr(600,root,uucp) %dev(c,45,73) /lib/udev/devices/isdnctrl9 -%attr(600,root,uucp) %dev(c,45,74) /lib/udev/devices/isdnctrl10 -%attr(600,root,uucp) %dev(c,45,75) /lib/udev/devices/isdnctrl11 -%attr(600,root,uucp) %dev(c,45,76) /lib/udev/devices/isdnctrl12 -%attr(600,root,uucp) %dev(c,45,77) /lib/udev/devices/isdnctrl13 -%attr(600,root,uucp) %dev(c,45,78) /lib/udev/devices/isdnctrl14 -%attr(600,root,uucp) %dev(c,45,79) /lib/udev/devices/isdnctrl15 -%attr(664,root,uucp) %dev(c,43,0) /lib/udev/devices/ttyI0 -%attr(664,root,uucp) %dev(c,43,1) /lib/udev/devices/ttyI1 -%attr(664,root,uucp) %dev(c,43,2) /lib/udev/devices/ttyI2 -%attr(664,root,uucp) %dev(c,43,3) /lib/udev/devices/ttyI3 -%attr(664,root,uucp) %dev(c,43,4) /lib/udev/devices/ttyI4 -%attr(664,root,uucp) %dev(c,43,5) /lib/udev/devices/ttyI5 -%attr(664,root,uucp) %dev(c,43,6) /lib/udev/devices/ttyI6 -%attr(664,root,uucp) %dev(c,43,7) /lib/udev/devices/ttyI7 -%attr(664,root,uucp) %dev(c,43,8) /lib/udev/devices/ttyI8 -%attr(664,root,uucp) %dev(c,43,9) /lib/udev/devices/ttyI9 -%attr(664,root,uucp) %dev(c,43,10) /lib/udev/devices/ttyI10 -%attr(664,root,uucp) %dev(c,43,11) /lib/udev/devices/ttyI11 -%attr(664,root,uucp) %dev(c,43,12) /lib/udev/devices/ttyI12 -%attr(664,root,uucp) %dev(c,43,13) /lib/udev/devices/ttyI13 -%attr(664,root,uucp) %dev(c,43,14) /lib/udev/devices/ttyI14 -%attr(664,root,uucp) %dev(c,43,15) /lib/udev/devices/ttyI15 +/usr/lib/tmpfiles.d/i4l.conf ### init scripts %config /etc/init.d/isdn ### sysconfig ### @@ -611,8 +576,8 @@ %dir /etc/sysconfig/isdn/scripts /etc/sysconfig/isdn/scripts/* /etc/sysconfig/network/scripts/* -### SuSEconfig.isdn ### -/sbin/conf.d/SuSEconfig.isdn +### postprocess ### +/etc/sysconfig/isdn/scripts/postprocess.isdn ### for x11 %{_xorg7_prefix}/include/X11/bitmaps/netactive %{_xorg7_prefix}/include/X11/bitmaps/netactiveout ++++++ divactrl_2.1-dialog.patch ++++++ --- Makefile.in.orig 2012-10-18 18:21:49.000000000 +0200 +++ Makefile.in 2012-10-18 18:21:55.000000000 +0200 @@ -92,7 +92,6 @@ $(INSTALL_PROGRAM) scripts/Config.dlg $(DESTDIR)$(DATA_DIR)/Config.dlg $(INSTALL_PROGRAM) scripts/Support $(DESTDIR)$(DATA_DIR)/Support $(INSTALL_PROGRAM) scripts/Trace $(DESTDIR)$(DATA_DIR)/Trace - $(INSTALL_PROGRAM) scripts/dialog $(DESTDIR)$(DATA_DIR)/dialog $(INSTALL_CFG) scripts/cfg_divas.sh $(DESTDIR)$(DATA_DIR)/cfg_divas.sh $(INSTALL_CFG) scripts/divas_sys_info.sh $(DESTDIR)$(DATA_DIR)/divas_sys_info.sh $(INSTALL_CFG) scripts/divas_stop.rc $(DESTDIR)$(DATA_DIR)/divas_stop.rc ++++++ i4l-base-postprocess ++++++ ++++ 835 lines (skipped) ++++++ i4l-base-rpmlintrc ++++++ addFilter("devel-file-in-non-devel-package") ++++++ i4l-base-sysconfig ++++++ ## Path: System/SuSEconfig ## Type: yesno ## Default: yes ## Config: isdn # # May SuSEconfig.isdn modify your /etc/ppp/pap-secret or # /etc/ppp/chap-secrets ? (yes/no) # MODIFY_SECRETS="yes" ++++++ i4l.conf ++++++ # Static device nodes for i4l # See tmpfiles.d(5) for details #Type Path Mode UID GID Age Argument c /dev/ippp0 600 root uucp - 45:128 c /dev/ippp1 600 root uucp - 45:129 c /dev/ippp2 600 root uucp - 45:130 c /dev/ippp3 600 root uucp - 45:131 c /dev/ippp4 600 root uucp - 45:132 c /dev/ippp5 600 root uucp - 45:133 c /dev/ippp6 600 root uucp - 45:134 c /dev/ippp7 600 root uucp - 45:135 c /dev/ippp8 600 root uucp - 45:136 c /dev/ippp9 600 root uucp - 45:137 c /dev/ippp10 600 root uucp - 45:138 c /dev/ippp11 600 root uucp - 45:139 c /dev/ippp12 600 root uucp - 45:140 c /dev/ippp13 600 root uucp - 45:141 c /dev/ippp14 600 root uucp - 45:142 c /dev/ippp15 600 root uucp - 45:143 c /dev/isdninfo 644 root uucp - 45:255 c /dev/isdnctrl0 600 root uucp - 45:64 c /dev/isdnctrl1 600 root uucp - 45:65 c /dev/isdnctrl2 600 root uucp - 45:66 c /dev/isdnctrl3 600 root uucp - 45:67 c /dev/isdnctrl4 600 root uucp - 45:68 c /dev/isdnctrl5 600 root uucp - 45:69 c /dev/isdnctrl6 600 root uucp - 45:70 c /dev/isdnctrl7 600 root uucp - 45:71 c /dev/isdnctrl8 600 root uucp - 45:72 c /dev/isdnctrl9 600 root uucp - 45:73 c /dev/isdnctrl10 600 root uucp - 45:74 c /dev/isdnctrl11 600 root uucp - 45:75 c /dev/isdnctrl12 600 root uucp - 45:76 c /dev/isdnctrl13 600 root uucp - 45:77 c /dev/isdnctrl14 600 root uucp - 45:78 c /dev/isdnctrl15 600 root uucp - 45:79 c /dev/ttyI0 664 root uucp - 43:0 c /dev/ttyI1 664 root uucp - 43:1 c /dev/ttyI2 664 root uucp - 43:2 c /dev/ttyI3 664 root uucp - 43:3 c /dev/ttyI4 664 root uucp - 43:4 c /dev/ttyI5 664 root uucp - 43:5 c /dev/ttyI6 664 root uucp - 43:6 c /dev/ttyI7 664 root uucp - 43:7 c /dev/ttyI8 664 root uucp - 43:8 c /dev/ttyI9 664 root uucp - 43:9 c /dev/ttyI10 664 root uucp - 43:10 c /dev/ttyI11 664 root uucp - 43:11 c /dev/ttyI12 664 root uucp - 43:12 c /dev/ttyI13 664 root uucp - 43:13 c /dev/ttyI14 664 root uucp - 43:14 c /dev/ttyI15 664 root uucp - 43:15 L /dev/isdnctrl - - - - /dev/isdnctrl0 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de