April 2013 - openSUSE Commits - openSUSE Mailing Lists

commit dropbear for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package dropbear for openSUSE:Factory checked in at 2013-04-29 09:52:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dropbear (Old) and /work/SRC/openSUSE:Factory/.dropbear.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dropbear", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dropbear/dropbear.changes 2013-03-30 14:55:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dropbear.new/dropbear.changes 2013-04-29 09:52:49.000000000 +0200 @@ -1,0 +2,14 @@ +Sat Apr 20 18:49:38 UTC 2013 - thardeck(a)suse.com + +- reverted init file installation on 12.3 + +------------------------------------------------------------------- +Fri Apr 19 08:26:17 UTC 2013 - thardeck(a)suse.com + +- imported upstream version 2013.58 + * Fix building with Zlib disabled, thanks to Hans Harder and cuma@freetz + * Use % as a separator for ports, fixes scp in multihop mode, from Hans Harder + * Reject logins for other users when running as non-root, from Hans Harder + * Disable client immediate authentication request by default, it prevents passwordless logins from working + +------------------------------------------------------------------- @@ -17 +31 @@ - * A few improvements for Android from Reimar D�ffinger + * A few improvements for Android from Reimar Döffinger @@ -19 +33 @@ - reported by Norbert Bencz�r. Appears to be a very long-standing bug. + reported by Norbert Benczúr. Appears to be a very long-standing bug. Old: ---- dropbear-2013.56.tar.bz2 New: ---- dropbear-2013.58.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dropbear.spec ++++++ --- /var/tmp/diff_new_pack.5Z03Ez/_old 2013-04-29 09:52:50.000000000 +0200 +++ /var/tmp/diff_new_pack.5Z03Ez/_new 2013-04-29 09:52:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: dropbear -Version: 2013.56 +Version: 2013.58 Release: 0 Summary: A relatively small SSH 2 server and client License: MIT @@ -53,6 +53,7 @@ make install DESTDIR=%{buildroot} install -d %{buildroot}%{_sysconfdir}/%{name} install -D -m 0644 %{SOURCE3} "%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}" +#no init service needed anymore for 12.3+ install -D -m0755 %{SOURCE4} "%{buildroot}%{_initrddir}/%{name}" ln -sf ../../%{_initrddir}/%{name} "%{buildroot}%{_sbindir}/rc%{name}" %if 0%{?suse_version} >= 1210 ++++++ dropbear-2013.56.tar.bz2 -> dropbear-2013.58.tar.bz2 ++++++ ++++ 4378 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit digikam for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2013-04-29 09:52:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2013-04-18 10:14:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2013-04-29 09:52:43.000000000 +0200 @@ -5 +5 @@ - detection of certain cameras (bnc#814622, bko#311393) + detection of certain cameras (bnc#814622, kde#311393) @@ -10 +10 @@ -- Update to 3.1.0: +- Update to 3.1.0 (bnc#816693): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clementine for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package clementine for openSUSE:Factory checked in at 2013-04-29 09:52:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clementine (Old) and /work/SRC/openSUSE:Factory/.clementine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clementine", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2013-04-06 19:53:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.clementine.new/clementine.changes 2013-04-29 09:52:38.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Apr 28 09:15:24 UTC 2013 - davejplater(a)gmail.com + +- Fixed bnc#815434 with "-DCMAKE_BUILD_TYPE:STRING=Release" flag. +- Fixed factory build with clementine-1.1.1-fixboostparseerror.patch + see also QTBUG-22829 + +------------------------------------------------------------------- New: ---- clementine-1.1.1-fixboostparseerror.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clementine.spec ++++++ --- /var/tmp/diff_new_pack.nylFqR/_old 2013-04-29 09:52:41.000000000 +0200 +++ /var/tmp/diff_new_pack.nylFqR/_new 2013-04-29 09:52:41.000000000 +0200 @@ -36,6 +36,9 @@ # Patch to fix factory build which fails on glib's depreciated mark of "void g_type_init" in gobject/gtype.h # Reported upstream, issue: https://code.google.com/p/clementine-player/issues/detail?id=3596 Patch1: clementine-nowerror.patch +# Patch to fix factory build failure due to an issue between boost and qt4. See : +# https://bugreports.qt-project.org/browse/QTBUG-22829 +Patch2: clementine-1.1.1-fixboostparseerror.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: fdupes @@ -102,6 +105,7 @@ %setup -q %patch0 %patch1 +%patch2 # Remote control support cannot be enabled without the owner of gloox (http://camaya.net/gloox) # first giving permission for relicensing to GPLv2 or later. See bnc#695820 rm -rf --verbose 3rdparty/gloox @@ -116,12 +120,14 @@ export CFLAGS="$CXXFLAGS" mkdir build && cd build && \ cmake -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ %if 0%{?suse_version} >= 1230 -DENABLE_GOOGLE_DRIVE=ON \ %endif - -DENABLE_MOODBAR=ON .. -#cat %%{_includedir}/glib-2.0/gobject/gtype.h + -DENABLE_MOODBAR=ON \ + .. +find ../ %{_includedir} -name 'has_binary_operator.hp' make %{?_smp_mflags} %install ++++++ clementine-1.1.1-fixboostparseerror.patch ++++++ Index: src/core/mergedproxymodel.h =================================================================== --- src/core/mergedproxymodel.h.orig 2012-10-11 13:16:39.000000000 +0200 +++ src/core/mergedproxymodel.h 2013-04-28 10:32:44.561601516 +0200 @@ -20,10 +20,12 @@ #include <QAbstractProxyModel> +#ifndef Q_MOC_RUN #include <boost/multi_index_container.hpp> #include <boost/multi_index/member.hpp> #include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/hashed_index.hpp> +#endif using boost::multi_index::multi_index_container; using boost::multi_index::indexed_by; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aranym for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '13

29 Apr '13

Hello community, here is the log from the commit of package aranym for openSUSE:Factory checked in at 2013-04-29 09:52:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aranym (Old) and /work/SRC/openSUSE:Factory/.aranym.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aranym", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/aranym/aranym.changes 2013-04-17 06:59:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aranym.new/aranym.changes 2013-04-29 09:52:34.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 28 12:35:52 UTC 2013 - schwab(a)linux-m68k.org + +- byteswap.patch: Avoid conflict with <byteswap.h> imported by SDL + +------------------------------------------------------------------- New: ---- byteswap.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aranym.spec ++++++ --- /var/tmp/diff_new_pack.DgpIsC/_old 2013-04-29 09:52:37.000000000 +0200 +++ /var/tmp/diff_new_pack.DgpIsC/_new 2013-04-29 09:52:37.000000000 +0200 @@ -34,6 +34,7 @@ Release: 0 Source: %{name}-%{version}.tar.gz Source1: afros-0.9.6-1.zip +Patch1: byteswap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,6 +67,7 @@ %prep %setup -q -n %{name}-%{version} -a 1 +%patch1 -p1 # Don't remove -g from CFLAGS sed -i -e 's,/-g,/-:,' configure ++++++ byteswap.patch ++++++ From: Andreas Schwab <schwab(a)linux-m68k.org> Date: Sun, 28 Apr 2013 14:21:46 +0200 Subject: [PATCH] Avoid conflict with definitions from <byteswap.h> diff --git a/src/uae_cpu/compiler/compemu.h b/src/uae_cpu/compiler/compemu.h index d2a942c..233dca8 100644 --- a/src/uae_cpu/compiler/compemu.h +++ b/src/uae_cpu/compiler/compemu.h @@ -396,7 +396,9 @@ DECLARE_MIDFUNC(lea_l_rr_indexed(W4 d, R4 s, R4 index, IMM factor)); DECLARE_MIDFUNC(mov_l_bRr(R4 d, R4 s, IMM offset)); DECLARE_MIDFUNC(mov_w_bRr(R4 d, R2 s, IMM offset)); DECLARE_MIDFUNC(mov_b_bRr(R4 d, R1 s, IMM offset)); +#undef bswap_32 DECLARE_MIDFUNC(bswap_32(RW4 r)); +#undef bswap_16 DECLARE_MIDFUNC(bswap_16(RW2 r)); DECLARE_MIDFUNC(mov_l_rr(W4 d, R4 s)); DECLARE_MIDFUNC(mov_l_mr(IMM d, R4 s)); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virtualbox for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package virtualbox for openSUSE:Factory checked in at 2013-04-26 19:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtualbox (Old) and /work/SRC/openSUSE:Factory/.virtualbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtualbox", Maintainer is "MKudlvasr(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/virtualbox/virtualbox.changes 2013-04-20 18:04:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.virtualbox.new/virtualbox.changes 2013-04-26 19:22:12.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 26 08:10:58 UTC 2013 - fcrozat(a)suse.com + +- Move udev rules to /usr/lib/udev/rules.d for openSUSE 12.3 (and + later) and to /lib/udev/rules.d for older distributions. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtualbox.spec ++++++ --- /var/tmp/diff_new_pack.OzTAfY/_old 2013-04-26 19:22:18.000000000 +0200 +++ /var/tmp/diff_new_pack.OzTAfY/_new 2013-04-26 19:22:18.000000000 +0200 @@ -18,6 +18,12 @@ %define _vbox_instdir /usr/lib/virtualbox +%if 0%{?suse_version} >= 1230 +%define _udevrulesdir /usr/lib/udev +%else +%define _udevrulesdir /lib/udev +%endif + Name: virtualbox %if %suse_version > 1230 BuildRequires: which @@ -375,7 +381,7 @@ %__install -d -m 755 %{buildroot}%{_sysconfdir}/default %__install -d -m 755 %{buildroot}%{_sysconfdir}/init.d %__install -d -m 755 %{buildroot}%{_sysconfdir}/vbox -%__install -d -m 755 %{buildroot}%{_sysconfdir}/udev/rules.d +%__install -d -m 755 %{buildroot}%{_udevrulesdir} %__install -d -m 755 %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d #################################################################################### @@ -407,7 +413,7 @@ %__ln_s %{_sysconfdir}/init.d/vboxadd \ %{buildroot}%{_sbindir}/rcvboxadd # udev rule for guest (virtualbox-guest-tools) -%__install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxguest.rules +%__install -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules # ############################################################## echo "entering guest-x11 install section" @@ -518,7 +524,7 @@ %__install -m 644 out/linux.*/release/bin/VBox.png \ %{buildroot}%{_datadir}/pixmaps/virtualbox.png # install udev rule for host (virtualbox) -%__install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/udev/rules.d/60-vboxdrv.rules +%__install -m 644 %{SOURCE2} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules # install config with session shutdown defs %__install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/default/virtualbox #install wrapper script @@ -546,7 +552,7 @@ %{buildroot}%{_sysconfdir}/vbox/vbox.cfg # install udev helper script for creating usb devices install -m 0755 -D src/VBox/Installer/linux/VBoxCreateUSBNode.sh \ - $RPM_BUILD_ROOT/lib/udev/VBoxCreateUSBNode.sh + $RPM_BUILD_ROOT%{_udevrulesdir}/../VBoxCreateUSBNode.sh ###################################################### echo "entrering python-virtualbox install section" ###################################################### @@ -740,7 +746,7 @@ %{_vbox_instdir}/components/*.xpt %dir %{_datadir}/virtualbox %config %{_sysconfdir}/default/virtualbox -%config(noreplace) %{_sysconfdir}/udev/rules.d/60-vboxdrv.rules +%{_udevrulesdir}/60-vboxdrv.rules %config %{_sysconfdir}/init.d/vboxdrv %dir %{_sysconfdir}/vbox %config %{_sysconfdir}/vbox/vbox.cfg @@ -748,7 +754,7 @@ %{_var}/adm/fillup-templates/sysconfig.vbox %{_sbindir}/rcvboxes %{_sbindir}/rcvboxdrv -/lib/udev/VBoxCreateUSBNode.sh +%{_udevrulesdir}/../VBoxCreateUSBNode.sh %if %suse_version >= 1140 %verify(not mode) %attr(4750,root,vboxusers) %{_vbox_instdir}/VBoxNetDHCP %else @@ -798,7 +804,7 @@ %{_bindir}/VBoxControl %{_bindir}/VBoxService /sbin/mount.vboxsf -%config(noreplace) %{_sysconfdir}/udev/rules.d/60-vboxguest.rules +%{_udevrulesdir}/60-vboxguest.rules %config %{_sysconfdir}/init.d/vboxadd %{_sbindir}/rcvboxadd # -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit systemd for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-04-26 19:21:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-04-23 11:39:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-04-26 19:22:00.000000000 +0200 @@ -1,0 +2,27 @@ +Fri Apr 26 16:37:28 CEST 2013 - fcrozat(a)suse.com + +- Fix handle-etc-HOSTNAME.patch to properly set hostname at startup + when using /etc/HOSTNAME. + +------------------------------------------------------------------- +Thu Apr 25 08:19:30 UTC 2013 - rmilasan(a)suse.com + +- Rename remaning udev patches (clean-up). +- Generate %{_libexecdir}/modules-load.d/sg.conf so we load sg module at + boot time not from udev (bnc#761109). +- Drop unused patches: + 1001-Reinstate-TIMEOUT-handling.patch + 1005-udev-fix-sg-autoload-regression.patch + 1026-re-add-persistent-net.patch + +------------------------------------------------------------------- +Tue Apr 23 14:58:47 CEST 2013 - fcrozat(a)suse.com + +- Use drop-in file to fix bnc#804158. + +------------------------------------------------------------------- +Tue Apr 23 12:44:16 UTC 2013 - coolo(a)suse.com + +- add some more conflicts to make bootstrap work + +------------------------------------------------------------------- systemd.changes: same change Old: ---- 1001-Reinstate-TIMEOUT-handling.patch 1002-re-enable-by_path-links-for-ata-devices.patch 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch 1004-udev-netlink-null-rules.patch 1005-udev-fix-sg-autoload-regression.patch 1007-fix-devname-prefix.patch 1021-create-default-links-for-primary-cd_dvd-drive.patch 1026-re-add-persistent-net.patch 1027-udev-always-rename-network.patch New: ---- 1001-re-enable-by_path-links-for-ata-devices.patch 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch 1003-udev-netlink-null-rules.patch 1004-fix-devname-prefix.patch 1005-create-default-links-for-primary-cd_dvd-drive.patch 1006-udev-always-rename-network.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.yHWFn4/_old 2013-04-26 19:22:03.000000000 +0200 +++ /var/tmp/diff_new_pack.yHWFn4/_new 2013-04-26 19:22:03.000000000 +0200 @@ -81,6 +81,7 @@ %if 0%{?bootstrap} Requires: this-is-only-for-build-envs Conflicts: systemd +Conflicts: kiwi %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -169,24 +170,18 @@ Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch # udev patches -# PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch -Patch1001: 1001-Reinstate-TIMEOUT-handling.patch -# PATCH-FIX-OPENSUSE 1002-re-enable-by_path-links-for-ata-devices.patch -Patch1002: 1002-re-enable-by_path-links-for-ata-devices.patch -# PATCH-FIX-OPENSUSE 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -Patch1003: 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -# PATCH-FIX-OPENSUSE 1004-udev-netlink-null-rules.patch -Patch1004: 1004-udev-netlink-null-rules.patch -# PATCH-FIX-OPENSUSE 1005-udev-fix-sg-autoload-regression.patch -Patch1005: 1005-udev-fix-sg-autoload-regression.patch -# PATCH-FIX-OPENSUSE 1007-fix-devname-prefix.patch fcrozat(a)suse.com -- fix modules.devname path, it isn't in /usr -Patch1007: 1007-fix-devname-prefix.patch -# PATCH-FIX-OPENSUSE 1021-create-default-links-for-primary-cd_dvd-drive.patch -Patch1021: 1021-create-default-links-for-primary-cd_dvd-drive.patch -# PATCH-FIX-OPENSUSE 1026-re-add-persistent-net.patch -Patch1026: 1026-re-add-persistent-net.patch -# PATCH-FIX-OPENSUSE 1027-udev-always-rename-network.patch -Patch1027: 1027-udev-always-rename-network.patch +# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch +Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch +# PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +Patch1002: 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +# PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch +Patch1003: 1003-udev-netlink-null-rules.patch +# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat(a)suse.com -- fix modules.devname path, it isn't in /usr +Patch1004: 1004-fix-devname-prefix.patch +# PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch +Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch +# PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch +Patch1006: 1006-udev-always-rename-network.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -205,6 +200,9 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?bootstrap} +Conflicts: systemd-devel +%endif %description devel Development headers and auxiliary files for developing applications for systemd. @@ -237,7 +235,7 @@ Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} -Conflicts: libudev%{udev_major} = %{version} +Conflicts: libudev%{udev_major} Conflicts: udev %endif @@ -257,6 +255,7 @@ Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} +Conflicts: kiwi %endif %description -n lib%{udevpkgname}%{udev_major} @@ -365,10 +364,7 @@ %patch1003 -p1 %patch1004 -p1 %patch1005 -p1 -%patch1007 -p1 -%patch1021 -p1 -%patch1026 -p1 -%patch1027 -p1 +%patch1006 -p1 #systemd %patch0 -p1 @@ -507,6 +503,13 @@ # don't mount /tmp as tmpfs for now rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount +# create %{_libexecdir}/modules-load.d +mkdir -p %{buildroot}%{_libexecdir}/modules-load.d +cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf +# load sg module at boot time +sg +EOF + # To avoid making life hard for Factory developers, don't package the # kernel.core_pattern setting until systemd-coredump is a part of an actual # systemd release and it's made clear how to get the core dumps out of the @@ -549,10 +552,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants -src="%buildroot/%_libexecdir/systemd/system/getty@.service" -dst="${src/@/@tty1}" -cp "$src" "$dst" -perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst" +# create drop-in to prevent tty1 to be cleared (bnc#804158) +mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty(a)tty1.service.d/ +echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty(a)tty1.service.d/noclear.conf +[Service] +# ensure tty1 isn't cleared (bnc#804158) +TTYVTDisallocate=no +EOF %fdupes -s %{buildroot}%{_mandir} @@ -716,7 +722,7 @@ %endif %clean -# rm -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -787,6 +793,8 @@ %dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system/default.target.wants %dir %{_prefix}/lib/systemd/system/dbus.target.wants +%dir %{_prefix}/lib/systemd/system/getty(a)tty1.service.d +%{_prefix}/lib/systemd/system/getty(a)tty1.service.d/noclear.conf %if ! 0%{?bootstrap} %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator %endif @@ -799,6 +807,7 @@ %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d +%{_libexecdir}/modules-load.d/sg.conf %dir %{_libexecdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d @@ -942,8 +951,6 @@ %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/write_dev_root_rule -%{_prefix}/lib/udev/write_net_rules -%{_prefix}/lib/udev/rule_generator.functions %dir %{_prefix}/lib/udev/keymaps %{_prefix}/lib/udev/keymaps/* %{_prefix}/lib/udev/keyboard-force-release.sh ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.yHWFn4/_old 2013-04-26 19:22:03.000000000 +0200 +++ /var/tmp/diff_new_pack.yHWFn4/_new 2013-04-26 19:22:03.000000000 +0200 @@ -76,6 +76,7 @@ %if 0%{?bootstrap} Requires: this-is-only-for-build-envs Conflicts: systemd +Conflicts: kiwi %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -164,24 +165,18 @@ Patch38: rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch # udev patches -# PATCH-FIX-OPENSUSE 1001-Reinstate-TIMEOUT-handling.patch -Patch1001: 1001-Reinstate-TIMEOUT-handling.patch -# PATCH-FIX-OPENSUSE 1002-re-enable-by_path-links-for-ata-devices.patch -Patch1002: 1002-re-enable-by_path-links-for-ata-devices.patch -# PATCH-FIX-OPENSUSE 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -Patch1003: 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -# PATCH-FIX-OPENSUSE 1004-udev-netlink-null-rules.patch -Patch1004: 1004-udev-netlink-null-rules.patch -# PATCH-FIX-OPENSUSE 1005-udev-fix-sg-autoload-regression.patch -Patch1005: 1005-udev-fix-sg-autoload-regression.patch -# PATCH-FIX-OPENSUSE 1007-fix-devname-prefix.patch fcrozat(a)suse.com -- fix modules.devname path, it isn't in /usr -Patch1007: 1007-fix-devname-prefix.patch -# PATCH-FIX-OPENSUSE 1021-create-default-links-for-primary-cd_dvd-drive.patch -Patch1021: 1021-create-default-links-for-primary-cd_dvd-drive.patch -# PATCH-FIX-OPENSUSE 1026-re-add-persistent-net.patch -Patch1026: 1026-re-add-persistent-net.patch -# PATCH-FIX-OPENSUSE 1027-udev-always-rename-network.patch -Patch1027: 1027-udev-always-rename-network.patch +# PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch +Patch1001: 1001-re-enable-by_path-links-for-ata-devices.patch +# PATCH-FIX-OPENSUSE 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +Patch1002: 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch +# PATCH-FIX-OPENSUSE 1003-udev-netlink-null-rules.patch +Patch1003: 1003-udev-netlink-null-rules.patch +# PATCH-FIX-OPENSUSE 1004-fix-devname-prefix.patch fcrozat(a)suse.com -- fix modules.devname path, it isn't in /usr +Patch1004: 1004-fix-devname-prefix.patch +# PATCH-FIX-OPENSUSE 1005-create-default-links-for-primary-cd_dvd-drive.patch +Patch1005: 1005-create-default-links-for-primary-cd_dvd-drive.patch +# PATCH-FIX-OPENSUSE 1006-udev-always-rename-network.patch +Patch1006: 1006-udev-always-rename-network.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -200,6 +195,9 @@ License: LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +%if 0%{?bootstrap} +Conflicts: systemd-devel +%endif %description devel Development headers and auxiliary files for developing applications for systemd. @@ -232,7 +230,7 @@ Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version} -Conflicts: libudev%{udev_major} = %{version} +Conflicts: libudev%{udev_major} Conflicts: udev %endif @@ -252,6 +250,7 @@ Requires: %{udevpkgname} >= %{version}-%{release} %if 0%{?bootstrap} Conflicts: libudev%{udev_major} +Conflicts: kiwi %endif %description -n lib%{udevpkgname}%{udev_major} @@ -360,10 +359,7 @@ %patch1003 -p1 %patch1004 -p1 %patch1005 -p1 -%patch1007 -p1 -%patch1021 -p1 -%patch1026 -p1 -%patch1027 -p1 +%patch1006 -p1 #systemd %patch0 -p1 @@ -502,6 +498,13 @@ # don't mount /tmp as tmpfs for now rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount +# create %{_libexecdir}/modules-load.d +mkdir -p %{buildroot}%{_libexecdir}/modules-load.d +cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf +# load sg module at boot time +sg +EOF + # To avoid making life hard for Factory developers, don't package the # kernel.core_pattern setting until systemd-coredump is a part of an actual # systemd release and it's made clear how to get the core dumps out of the @@ -544,10 +547,13 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants -src="%buildroot/%_libexecdir/systemd/system/getty@.service" -dst="${src/@/@tty1}" -cp "$src" "$dst" -perl -i -pe 's{^# the VT is cleared.*}{}i;s{(^TTYVTDisallocate=.*)}{}' "$dst" +# create drop-in to prevent tty1 to be cleared (bnc#804158) +mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty(a)tty1.service.d/ +echo << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty(a)tty1.service.d/noclear.conf +[Service] +# ensure tty1 isn't cleared (bnc#804158) +TTYVTDisallocate=no +EOF %fdupes -s %{buildroot}%{_mandir} @@ -711,7 +717,7 @@ %endif %clean -# rm -rf %{buildroot} +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -782,6 +788,8 @@ %dir %{_prefix}/lib/systemd/system-sleep/ %dir %{_prefix}/lib/systemd/system/default.target.wants %dir %{_prefix}/lib/systemd/system/dbus.target.wants +%dir %{_prefix}/lib/systemd/system/getty(a)tty1.service.d +%{_prefix}/lib/systemd/system/getty(a)tty1.service.d/noclear.conf %if ! 0%{?bootstrap} %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator %endif @@ -794,6 +802,7 @@ %dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d +%{_libexecdir}/modules-load.d/sg.conf %dir %{_libexecdir}/tmpfiles.d %dir %{_sysconfdir}/tmpfiles.d @@ -937,8 +946,6 @@ %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/write_dev_root_rule -%{_prefix}/lib/udev/write_net_rules -%{_prefix}/lib/udev/rule_generator.functions %dir %{_prefix}/lib/udev/keymaps %{_prefix}/lib/udev/keymaps/* %{_prefix}/lib/udev/keyboard-force-release.sh ++++++ 1002-re-enable-by_path-links-for-ata-devices.patch -> 1001-re-enable-by_path-links-for-ata-devices.patch ++++++ ++++++ 1003-rules-create-by-id-scsi-links-for-ATA-devices.patch -> 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch ++++++ ++++++ 1004-udev-netlink-null-rules.patch -> 1003-udev-netlink-null-rules.patch ++++++ --- /work/SRC/openSUSE:Factory/systemd/1004-udev-netlink-null-rules.patch 2013-04-23 11:39:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/1003-udev-netlink-null-rules.patch 2013-04-26 19:22:00.000000000 +0200 @@ -7,11 +7,11 @@ src/udev/udevd.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index 9be1931..d0c4c72 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -1414,6 +1414,8 @@ int main(int argc, char *argv[]) +Index: systemd-202/src/udev/udevd.c +=================================================================== +--- systemd-202.orig/src/udev/udevd.c ++++ systemd-202/src/udev/udevd.c +@@ -1407,6 +1407,8 @@ int main(int argc, char *argv[]) dev = udev_monitor_receive_device(monitor); if (dev != NULL) { udev_device_set_usec_initialized(dev, now(CLOCK_MONOTONIC)); ++++++ 1007-fix-devname-prefix.patch -> 1004-fix-devname-prefix.patch ++++++ --- /work/SRC/openSUSE:Factory/systemd/1007-fix-devname-prefix.patch 2013-04-23 11:39:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/1004-fix-devname-prefix.patch 2013-04-26 19:22:00.000000000 +0200 @@ -7,11 +7,11 @@ src/udev/udevd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index d0c4c72..599cd3b 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -831,7 +831,7 @@ static void static_dev_create_from_modules(struct udev *udev) +Index: systemd-202/src/udev/udevd.c +=================================================================== +--- systemd-202.orig/src/udev/udevd.c ++++ systemd-202/src/udev/udevd.c +@@ -824,7 +824,7 @@ static void static_dev_create_from_modul return; } ++++++ 1021-create-default-links-for-primary-cd_dvd-drive.patch -> 1005-create-default-links-for-primary-cd_dvd-drive.patch ++++++ ++++++ 1027-udev-always-rename-network.patch -> 1006-udev-always-rename-network.patch ++++++ ++++++ handle-etc-HOSTNAME.patch ++++++ --- /var/tmp/diff_new_pack.yHWFn4/_old 2013-04-26 19:22:03.000000000 +0200 +++ /var/tmp/diff_new_pack.yHWFn4/_new 2013-04-26 19:22:03.000000000 +0200 @@ -4,9 +4,44 @@ (bnc#803653) --- - src/hostname/hostnamed.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) + src/core/hostname-setup.c | 22 +++++++++++++++++----- + src/hostname/hostnamed.c | 12 +++++++++++- + 2 files changed, 28 insertions(+), 6 deletions(-) +diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c +index ac508af..15d206c 100644 +--- a/src/core/hostname-setup.c ++++ b/src/core/hostname-setup.c +@@ -61,12 +61,24 @@ int hostname_setup(void) { + + r = read_and_strip_hostname("/etc/hostname", &b); + if (r < 0) { +- if (r == -ENOENT) +- enoent = true; +- else ++ if (r == -ENOENT) { ++ /* use SUSE fallback */ ++ r = read_and_strip_hostname("/etc/HOSTNAME", &b); ++ if (r < 0) { ++ if (r == -ENOENT) ++ enoent = true; ++ else ++ log_warning("Failed to read configured hostname: %s", strerror(-r)); ++ hn = NULL; ++ } ++ else ++ hn = b; ++ ++ } ++ else { + log_warning("Failed to read configured hostname: %s", strerror(-r)); +- +- hn = NULL; ++ hn = NULL; ++ } + } else + hn = b; + diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index c7f454c..cfbd706 100644 --- a/src/hostname/hostnamed.c -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openct for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package openct for openSUSE:Factory checked in at 2013-04-26 19:21:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openct (Old) and /work/SRC/openSUSE:Factory/.openct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openct", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/openct/openct.changes 2013-03-22 12:05:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openct.new/openct.changes 2013-04-26 19:21:37.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 25 16:43:04 UTC 2013 - fcrozat(a)suse.com + +- Move udev rules to /usr/lib/udev for openSUSE 12.3 and later. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openct.spec ++++++ --- /var/tmp/diff_new_pack.Ex0zvD/_old 2013-04-26 19:21:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Ex0zvD/_new 2013-04-26 19:21:38.000000000 +0200 @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} >= 1230 +%define _udevrulesdir /usr/lib/udev +%else +%define _udevrulesdir /lib/udev +%endif + Name: openct Version: 0.6.20 Release: 0 @@ -161,7 +167,7 @@ --with-daemon-groups=%{GROUP}\ --with-bundle=%{ifddir}\ --with-ifddir=%{ifddir}\ - --with-udev=/lib/udev + --with-udev=%{_udevrulesdir} make %{?jobs:-j%jobs} %install @@ -179,8 +185,8 @@ install etc/init-script $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openct ln -s ../..%{_sysconfdir}/init.d/openct $RPM_BUILD_ROOT%{_sbindir}/rcopenct # Install 60-openct.rules rule for udev -mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d -install -m0644 etc/openct.udev $RPM_BUILD_ROOT/lib/udev/rules.d/60-openct.rules +mkdir -p $RPM_BUILD_ROOT%{udevrulesdir} +install -m0644 etc/openct.udev $RPM_BUILD_ROOT%{_udevrulesdir}/60-openct.rules # # Copy the rest of documentation cp LGPL-2.1 README.SUSE TODO doc/nonpersistent/ChangeLog etc/openct-disable.fdi $RPM_BUILD_ROOT%{_docdir}/%{name} @@ -223,7 +229,7 @@ %{_sbindir}/* %{_sysconfdir}/init.d/openct %config(noreplace) %{_sysconfdir}/openct.conf -/lib/udev/* +%{_udevrulesdir}/* %files -n libopenct1 %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mysql-connector-cpp for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package mysql-connector-cpp for openSUSE:Factory checked in at 2013-04-26 19:21:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mysql-connector-cpp (Old) and /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mysql-connector-cpp", Maintainer is "MHrusecky(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mysql-connector-cpp/mysql-connector-cpp.changes 2013-04-17 22:34:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mysql-connector-cpp.new/mysql-connector-cpp.changes 2013-04-26 19:21:30.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 19 14:29:56 CEST 2013 - mhrusecky(a)suse.cz + +- Do not use macro for make install as it doesn't work on SLE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-connector-cpp.spec ++++++ --- /var/tmp/diff_new_pack.aOSe1e/_old 2013-04-26 19:21:31.000000000 +0200 +++ /var/tmp/diff_new_pack.aOSe1e/_new 2013-04-26 19:21:31.000000000 +0200 @@ -133,7 +133,7 @@ chmod -x examples/* %install -%make_install +make install DESTDIR="%{buildroot}" rm -f %{buildroot}%{_libdir}/libmysqlcppconn-static.a rm -f %{buildroot}%{_prefix}/[A-Z]* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit i4l-base for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package i4l-base for openSUSE:Factory checked in at 2013-04-26 19:21:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/i4l-base (Old) and /work/SRC/openSUSE:Factory/.i4l-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "i4l-base", Maintainer is "orphaned(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/i4l-base/i4l-base.changes 2013-03-03 21:06:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.i4l-base.new/i4l-base.changes 2013-04-26 19:21:23.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 22 14:11:44 CEST 2013 - fcrozat(a)suse.com + +- Move udev rules to /usr/lib/udev/rules.d, they shouldn't live in + /etc/udev/rules.d +- Move isdn.sh script to /usr/lib/udev and fix udev rules + accordingly. + +------------------------------------------------------------------- +Fri Apr 19 17:15:40 UTC 2013 - fcrozat(a)suse.com + +- Do not own udev directories + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ i4l-base.spec ++++++ --- /var/tmp/diff_new_pack.ZxC9pS/_old 2013-04-26 19:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxC9pS/_new 2013-04-26 19:21:26.000000000 +0200 @@ -451,8 +451,8 @@ rm -rf $RPM_BUILD_ROOT/usr/man rm -rf $RPM_BUILD_ROOT/usr/X11R6/man # 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 -m644 -D %{S:4} $RPM_BUILD_ROOT/usr/lib/udev/rules.d/45-isdn.rules +install -m755 -D %{S:5} $RPM_BUILD_ROOT/usr/lib/udev/isdn.sh 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 @@ -535,10 +535,6 @@ %config /etc/ppp/auth-down %config /etc/ppp/auth-up %config /etc/ppp/ioptions -### /etc/udev/rules.d -%dir /etc/udev -%dir /etc/udev/rules.d -%config /etc/udev/rules.d/45-isdn.rules ### /sbin /sbin/actctrl /sbin/divactrl @@ -568,8 +564,8 @@ %dir /lib/firmware/isdn /lib/firmware/isdn/ISAR.BIN ### udev devices -%dir /lib/udev -/lib/udev/isdn.sh +/usr/lib/udev/rules.d/45-isdn.rules +/usr/lib/udev/isdn.sh /usr/lib/tmpfiles.d/i4l.conf ### init scripts %config /etc/init.d/isdn ++++++ 45-isdn.rules ++++++ --- /var/tmp/diff_new_pack.ZxC9pS/_old 2013-04-26 19:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxC9pS/_new 2013-04-26 19:21:26.000000000 +0200 @@ -11,41 +11,41 @@ KERNEL=="isdninfo*", MODE="444" # ISDN USB -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/c00*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/1000*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/1900*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2000*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2200*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2300*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2800*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/3000*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/3500*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/3600*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2805*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2806*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/4401*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/4601*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="483/4810*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="959/2bd0*", RUN+="/lib/udev/isdn.sh" -SUBSYSTEM=="usb", ENV{PRODUCT}=="9bf/*", RUN+="/lib/udev/isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/c00*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/1000*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/1900*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2000*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2200*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2300*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2800*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/3000*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/3500*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/3600*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2805*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/2806*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/4401*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="57c/4601*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="483/4810*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="959/2bd0*", RUN+="isdn.sh" +SUBSYSTEM=="usb", ENV{PRODUCT}=="9bf/*", RUN+="isdn.sh" # ISDN PCMCIA # AVM B1 models -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pb845DC335pc*pd*", RUN+="/lib/udev/isdn.sh b1 1" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pb81E10430pc*pd*", RUN+="/lib/udev/isdn.sh b1 2" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pb18E8558Apc*pd*", RUN+="/lib/udev/isdn.sh b1 3" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pb845DC335pc*pd*", RUN+="isdn.sh b1 1" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pb81E10430pc*pd*", RUN+="isdn.sh b1 2" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pb18E8558Apc*pd*", RUN+="isdn.sh b1 3" # AVM A1 models (aka Fritz!Card PCMCIA) -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pbADC9D4BBpc*pd*", RUN+="/lib/udev/isdn.sh a1 1" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa8D9761C8pb01C5AA7Bpc*pd*", RUN+="/lib/udev/isdn.sh a1 2" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa95D42008pbADC9D4BBpc*pd*", RUN+="isdn.sh a1 1" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa8D9761C8pb01C5AA7Bpc*pd*", RUN+="isdn.sh a1 2" # teles -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa67B50EAEpbE9E70119pc*pd*", RUN+="/lib/udev/isdn.sh teles 1" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa67B50EAEpbE9E70119pc*pd*", RUN+="isdn.sh teles 1" # sedlbauer -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbF3612E1Dpc6B95C78Apd*", RUN+="/lib/udev/isdn.sh sedlbauer 1" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pc397B7E90pd*", RUN+="/lib/udev/isdn.sh sedlbauer 2" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pc2E5C7FCEpd*", RUN+="/lib/udev/isdn.sh sedlbauer 3" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pc8DB143FEpd*", RUN+="/lib/udev/isdn.sh sedlbauer 4" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pcB391AB4Cpd*", RUN+="/lib/udev/isdn.sh sedlbauer 5" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*paD79E0B84pb21D083AEpc*pd*", RUN+="/lib/udev/isdn.sh sedlbauer 6" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbF3612E1Dpc6B95C78Apd*", RUN+="isdn.sh sedlbauer 1" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pc397B7E90pd*", RUN+="isdn.sh sedlbauer 2" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pc2E5C7FCEpd*", RUN+="isdn.sh sedlbauer 3" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pc8DB143FEpd*", RUN+="isdn.sh sedlbauer 4" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa81FB79F5pbE4E9BC12pcB391AB4Cpd*", RUN+="isdn.sh sedlbauer 5" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*paD79E0B84pb21D083AEpc*pd*", RUN+="isdn.sh sedlbauer 6" # elsa -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa983DE2C4pb333BA257pc*pd*", RUN+="/lib/udev/isdn.sh elsa 1" -SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa639E5718pb333BA257pc*pd*", RUN+="/lib/udev/isdn.sh elsa 2" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa983DE2C4pb333BA257pc*pd*", RUN+="isdn.sh elsa 1" +SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="pcmcia:m*c*f*fn*pfn*pa639E5718pb333BA257pc*pd*", RUN+="isdn.sh elsa 2" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ffado for openSUSE:Factory
by root＠hilbert.suse.de 26 Apr '13

26 Apr '13

Hello community, here is the log from the commit of package ffado for openSUSE:Factory checked in at 2013-04-26 19:21:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffado (Old) and /work/SRC/openSUSE:Factory/.ffado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ffado", Maintainer is "StShaw(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ffado/ffado.changes 2012-12-28 14:59:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ffado.new/ffado.changes 2013-04-26 19:21:11.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 26 08:46:14 UTC 2013 - fcrozat(a)suse.com + +- Move udev rules to /usr/lib/udev for openSUSE 12.3 or later. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffado-mixer.spec ++++++ --- /var/tmp/diff_new_pack.iGaAov/_old 2013-04-26 19:21:12.000000000 +0200 +++ /var/tmp/diff_new_pack.iGaAov/_new 2013-04-26 19:21:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ffado-mixer # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ffado-mixer %define tname libffado Version: 2.1.0 @@ -40,13 +41,13 @@ BuildRequires: libraw1394-devel >= 1.3.0 BuildRequires: libxml++-devel BuildRequires: pkg-config +BuildRequires: python-qt4-devel BuildRequires: scons BuildRequires: subversion BuildRequires: update-desktop-files BuildRequires: xdg-utils BuildRequires: xorg-x11-fonts BuildRequires: pkgconfig(dbus-1) >= 1.0 -BuildRequires: python-qt4-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %{py_requires} ++++++ ffado.spec ++++++ --- /var/tmp/diff_new_pack.iGaAov/_old 2013-04-26 19:21:12.000000000 +0200 +++ /var/tmp/diff_new_pack.iGaAov/_new 2013-04-26 19:21:12.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ffado # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%if 0%{?suse_version} >= 1230 +%define _udevrulesdir /usr/lib/udev +%else +%define _udevrulesdir /lib/udev +%endif + Name: ffado %define tname libffado Version: 2.1.0 @@ -109,6 +116,7 @@ PREFIX=%{_prefix} \ LIBDIR=%{_libdir} \ MANDIR=%{_mandir} \ + UDEVDIR=%{_udevrulesdir} \ ENABLE_GENERICAVC=yes \ SERIALIZE_USE_EXPAT=no \ DEBUG=no \ @@ -179,6 +187,6 @@ %files -n libffado2 %defattr(-,root,root) %{_libdir}/%{tname}.so.2* -/lib/udev/rules.d/60-ffado.rules +%{_udevrulesdir}/60-ffado.rules %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0