Please remove the changes from .changes and meego-distro.patch as well.
Related to that XAUTHORITY patch.
-Marko
On 09/09/2011 10:06 AM, Krisztian Litkey wrote:
Hi,
I have made the following changes to ohm in project Trunk:Testing. Please
review and accept ASAP.
Thank You,
Krisztian Litkey
[This message was auto-generated]
---
Request #23839:
submit: devel:resourcepolicy/ohm(r1c77baac6e1f8bd75ac166954ae9a15a) ->
Trunk:Testing/ohm
Message:
Ditched XAUTHORITY-kludge from ohmd.service.
State: new 2011-09-08T23:57:09 klitkey
Comment: None
changes files:
--------------
--- ohm.changes
+++ ohm.changes
@@ -0,0 +1,6 @@
+* Thu Sep 08 2011 Kalle Lampila<[email protected]> - 1.1.14
+- Added Xauthority environment (BMC#22887)
+
+* Thu Jul 28 2011 Brad Peters<[email protected]> - 1.1.14
+- Fixing build, merging divergent modifications in Trunk
+
spec files:
-----------
--- ohm.spec
+++ ohm.spec
@@ -1,6 +1,6 @@
#
# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22git
+# Generated by: spectacle version 0.22
#
#>> macros
#<< macros
@@ -8,7 +8,7 @@
Name: ohm
Summary: Open Hardware Manager
Version: 1.1.14
-Release: 0
+Release: 1
Group: System/Resource Policy
License: LGPLv2.1
URL: http://meego.gitorious.org/maemo-multimedia/ohm
@@ -19,7 +19,7 @@
Patch1: meego-distro.patch
Patch2: compiler-warn-fix.patch
Requires: ohm-config
-Requires: boardname>= 0.4-1
+Requires: boardname>= 0.4.1
Requires: systemd
Requires(preun): systemd
Requires(post): systemd
@@ -31,6 +31,7 @@
BuildRequires: pkgconfig(libsimple-trace)
BuildRequires: pkgconfig(boardname)
+
%description
Open Hardware Manager.
@@ -74,7 +75,6 @@
%patch1 -p1
# compiler-warn-fix.patch
%patch2 -p1
-
#>> setup
#<< setup
@@ -105,7 +105,7 @@
# enable ohmd in the basic systemd target
install -d $RPM_BUILD_ROOT/%{_lib}/systemd/system/basic.target.wants
ln -s /%{_lib}/systemd/system/ohmd.service \
- $RPM_BUILD_ROOT/%{_lib}/systemd/system/basic.target.wants/ohmd.service
+$RPM_BUILD_ROOT/%{_lib}/systemd/system/basic.target.wants/ohmd.service
#<< install post
@@ -116,10 +116,14 @@
systemctl daemon-reload
systemctl reload-or-try-restart ohmd.service
-
%postun
systemctl daemon-reload
+
+
+
+
+
%post plugin-core -p /sbin/ldconfig
%postun plugin-core -p /sbin/ldconfig
other changes:
--------------
++++++ meego-distro.patch
--- meego-distro.patch
+++ meego-distro.patch
@@ -1,4 +1,9 @@
From: Kalle.lampila<[email protected]>
+Date: Thu Sep 08 2011
+
+Added Xauthority setting (BMC#22887)
+
+From: Kalle.lampila<[email protected]>
Modify to use dbus type service instead of forking.
++++++ ohm.yaml
--- ohm.yaml
+++ ohm.yaml
@@ -1,7 +1,7 @@
Name: ohm
Summary: Open Hardware Manager
Version: 1.1.14
-Release: 0
+Release: 1
Group: System/Resource Policy
License: LGPLv2.1
URL: http://meego.gitorious.org/maemo-multimedia/ohm
@@ -18,8 +18,7 @@
Requires:
- ohm-config
- - boardname>= 0.4
- - systemd
+ - boardname>= 0.4.1
PkgConfigBR:
- glib-2.0
_______________________________________________
MeeGo-commits mailing list
[email protected]
http://lists.meego.com/listinfo/meego-commits
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging
