Hello community, here is the log from the commit of package laptop-mode-tools for openSUSE:Factory checked in at 2013-03-08 21:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/laptop-mode-tools (Old) and /work/SRC/openSUSE:Factory/.laptop-mode-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "laptop-mode-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/laptop-mode-tools/laptop-mode-tools.changes 2013-02-05 11:15:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.laptop-mode-tools.new/laptop-mode-tools.changes 2013-03-08 21:14:04.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Mar 8 18:29:54 UTC 2013 - [email protected] + +- laptop-mode-1.62-customize-installation-of-udev-systemd-files.patch: + introduce $LIB_D in install.sh so we can customize the installation + of systemd/udev files. +- drop laptop-mode-1.60-local-can-only-be-used-in-a-function.patch: + not need it anymore as 1.62 version has the fix. + +------------------------------------------------------------------- Old: ---- laptop-mode-1.60-local-can-only-be-used-in-a-function.patch New: ---- laptop-mode-1.62-customize-installation-of-udev-systemd-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ laptop-mode-tools.spec ++++++ --- /var/tmp/diff_new_pack.evxhbw/_old 2013-03-08 21:14:05.000000000 +0100 +++ /var/tmp/diff_new_pack.evxhbw/_new 2013-03-08 21:14:05.000000000 +0100 @@ -34,9 +34,16 @@ Patch4: laptop-mode-1.49-new-dirty-ratio-defaults.diff Patch5: laptop-mode-1.53-fix-pm-utils-sleep-script.diff Patch6: laptop-mode-1.53-moblin-enable-intel-hda-powersave.patch +Patch7: laptop-mode-1.62-customize-installation-of-udev-systemd-files.patch BuildArch: noarch BuildRequires: pm-utils +%if %suse_version > 1220 +%define _lib /usr/lib +%else +%define _lib /lib +%endif + %description Laptop Mode Tools is a laptop power saving package for Linux systems. It allows you to extend the battery life of your laptop, in several @@ -59,13 +66,14 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 cp %{S:2} . %build %install mkdir -p $RPM_BUILD_ROOT/etc/init.d -DESTDIR=$RPM_BUILD_ROOT MAN_D=%{_mandir} INSTALL=install INIT_D=/etc/init.d ACPI=DISABLED PMU=disabled APM=disabled ./install.sh +DESTDIR=$RPM_BUILD_ROOT MAN_D=%{_mandir} INSTALL=install INIT_D=/etc/init.d LIB_D=%{_lib} ACPI=DISABLED PMU=disabled APM=disabled ./install.sh install -D -m 0755 %{S:1} $RPM_BUILD_ROOT/usr/lib/pm-utils/power.d/laptop-mode-tools chmod 644 $RPM_BUILD_ROOT/%{_mandir}/man8/* ln -s /etc/init.d/laptop-mode %{buildroot}/usr/sbin/rclaptop-mode @@ -102,9 +110,11 @@ /usr/lib/pm-utils/sleep.d/01laptop-mode %doc /usr/share/man/man8/* %doc README.SUSE -/lib/udev/lmt-udev +%dir %{_lib}/udev +%{_lib}/udev/lmt-udev %dir /usr/lib/tmpfiles.d /usr/lib/tmpfiles.d/laptop-mode.conf -%config /lib/systemd/system/laptop-mode.service +%dir %{_lib}/systemd/system +%config %{_lib}/systemd/system/laptop-mode.service %changelog ++++++ laptop-mode-1.62-customize-installation-of-udev-systemd-files.patch ++++++ diff -Nrau laptop-mode-tools_1.62.orig/etc/rules/99-laptop-mode.rules laptop-mode-tools_1.62/etc/rules/99-laptop-mode.rules --- laptop-mode-tools_1.62.orig/etc/rules/99-laptop-mode.rules 2013-03-08 18:34:50.899952695 +0100 +++ laptop-mode-tools_1.62/etc/rules/99-laptop-mode.rules 2013-03-08 18:55:53.115938509 +0100 @@ -1,3 +1,3 @@ -ACTION=="change", SUBSYSTEM=="power_supply", RUN+="/lib/udev/lmt-udev auto" -ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="/lib/udev/lmt-udev auto" -ACTION=="add", SUBSYSTEM=="usb", RUN+="/lib/udev/lmt-udev force modules=usb-autosuspend devices=%k" +ACTION=="change", SUBSYSTEM=="power_supply", RUN+="@LIB_D@/udev/lmt-udev auto" +ACTION=="add|remove", SUBSYSTEM=="machinecheck", RUN+="@LIB_D@/udev/lmt-udev auto" +ACTION=="add", SUBSYSTEM=="usb", RUN+="@LIB_D@/udev/lmt-udev force modules=usb-autosuspend devices=%k" diff -Nrau laptop-mode-tools_1.62.orig/install.sh laptop-mode-tools_1.62/install.sh --- laptop-mode-tools_1.62.orig/install.sh 2013-03-08 18:34:50.855952696 +0100 +++ laptop-mode-tools_1.62/install.sh 2013-03-08 18:53:57.795939805 +0100 @@ -28,6 +28,7 @@ # [ -z "$MAN_D" ] && MAN_D="/usr/man" +[ -z "$LIB_D" ] && LIB_D="/lib" if [ -z "$ACPI" ] ; then ACPI=auto @@ -115,8 +116,8 @@ $INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/conf.d/board-specific" $INSTALL -d -m 755 "$DESTDIR/etc/laptop-mode/modules" $INSTALL -d -m 755 "$DESTDIR/usr/sbin" -$INSTALL -d -m 755 "$DESTDIR/lib/udev" -$INSTALL -d -m 755 "$DESTDIR/lib/systemd/system" +$INSTALL -d -m 755 "$DESTDIR/$LIB_D/udev" +$INSTALL -d -m 755 "$DESTDIR/$LIB_D/systemd/system" $INSTALL -d -m 755 "$DESTDIR/$MAN_D/man8" ALREADY_EXISTED=0 @@ -201,16 +202,18 @@ if ( ! $INSTALL -D -m 644 etc/rules/99-laptop-mode.rules "$DESTDIR/etc/udev/rules.d/99-laptop-mode.rules" ) ; then echo "$0: Failed to install udev rule into /etc/udev/rules.d/ Installation failed." exit 23 +else + sed -i -e "s|@LIB_D@|$LIB_D|g" $DESTDIR/etc/udev/rules.d/99-laptop-mode.rules >/dev/null 2>&1 fi # udev helper tool -if ( ! $INSTALL -D -m 755 etc/rules/lmt-udev "$DESTDIR/lib/udev/lmt-udev" ) ; then - echo "$0: Failed to install udev helper tool into /lib/udev/ Installation failed." +if ( ! $INSTALL -D -m 755 etc/rules/lmt-udev "$DESTDIR/$LIB_D/udev/lmt-udev" ) ; then + echo "$0: Failed to install udev helper tool into $LIB_D/udev/ Installation failed." fi # systemd service -if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.service "$DESTDIR/lib/systemd/system/laptop-mode.service" ) ; then - echo "$0: Failed to install systemd service into /lib/systemd/system/ Installation failed." +if ( ! $INSTALL -D -m 644 etc/systemd/laptop-mode.service "$DESTDIR/$LIB_D/systemd/system/laptop-mode.service" ) ; then + echo "$0: Failed to install systemd service into $LIB_D/systemd/system/ Installation failed." fi # and systemd's tmpfiles.d -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
