Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[sensorfw] fix yaml and update spec files
  • Loading branch information
Lorn Potter committed May 15, 2013
1 parent b989b1a commit 3014d61
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 26 deletions.
27 changes: 11 additions & 16 deletions rpm/sensorfw-qt5.spec
@@ -1,6 +1,6 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.25
# Generated by: spectacle version 0.26
#

Name: sensorfw-qt5
Expand All @@ -9,7 +9,7 @@ Name: sensorfw-qt5
# << macros

Summary: Sensor Framework Qt5
Version: 0.7.2.4
Version: 0.7.2.6
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand All @@ -33,8 +33,6 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(gconf-2.0)
#BuildRequires: pkgconfig(mce)
Provides: sensord-qt5
Obsoletes: sensorframework

%description
Expand All @@ -45,7 +43,9 @@ Sensor Framework provides an interface to hardware sensor drivers through logica
Summary: Sensor framework daemon libraries development headers
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt-devel
Requires: qt5-qtcore-devel
Requires: qt5-qtdbus-devel
Requires: qt5-qtnetwork-devel

%description devel
Development headers for sensor framework daemon and libraries.
Expand All @@ -55,8 +55,11 @@ Development headers for sensor framework daemon and libraries.
Summary: Unit test cases for sensord
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: qt5-qttest-devel
Requires: testrunner-lite
Requires: python
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig

%description tests
Contains unit test cases for CI environment.
Expand All @@ -65,7 +68,7 @@ Contains unit test cases for CI environment.
%package configs
Summary: Sensorfw configuration files
Group: System/Libraries
BuildArch: noarch
BuildArch: noarch
Requires: %{name} = %{version}
Provides: sensord-config
Provides: config-n900
Expand All @@ -80,7 +83,6 @@ Provides: config-u8500
Sensorfw configuration files.



%prep
%setup -q -n %{name}-%{version}

Expand All @@ -93,10 +95,7 @@ unset LD_AS_NEEDED
export LD_RUN_PATH=/usr/lib/sensord/
# << build pre

export QT_SELECT=5
%qmake5
#\
# CONFIG+=mce

make %{?jobs:-j%jobs}

Expand All @@ -107,7 +106,6 @@ make %{?jobs:-j%jobs}
rm -rf %{buildroot}
# >> install pre
# << install pre
export QT_SELECT=5
%qmake_install

# >> install post
Expand All @@ -118,7 +116,6 @@ mkdir -p %{buildroot}/%{_lib}/systemd/system/basic.target.wants
ln -s ../sensord.service %{buildroot}/%{_lib}/systemd/system/basic.target.wants/sensord.service
# << install post


%preun
if [ "$1" -eq 0 ]; then
systemctl stop sensord.service
Expand All @@ -133,11 +130,9 @@ systemctl reload-or-try-restart sensord.service
/sbin/ldconfig
systemctl daemon-reload

%post tests
/sbin/ldconfig
%post tests -p /sbin/ldconfig

%postun tests
/sbin/ldconfig
%postun tests -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
Expand Down
11 changes: 8 additions & 3 deletions rpm/sensorfw-qt5.yaml
@@ -1,6 +1,6 @@
Name: sensorfw-qt5
Summary: Sensor Framework Qt5
Version: 0.7.2.4
Version: 0.7.2.6
Release: 0
Group: "System/Sensor Framework"
License: LGPLv2+
Expand All @@ -19,12 +19,14 @@ Requires:

PkgConfigBR:
- Qt5Core
- Qt5DBus
- Qt5Network
- Qt5Test
- gconf-2.0

#PkgBR:
# - doxygen
# - graphviz
Provides: sensord-qt5
Obsoletes:
- sensorframework

Expand All @@ -38,14 +40,17 @@ SubPackages:
- Name: devel
Group: Development/Libraries
Requires:
- qt5-devel
- qt5-qtcore-devel
- qt5-qtdbus-devel
- qt5-qtnetwork-devel
Summary: Sensor framework daemon libraries development headers
Description: |
Development headers for sensor framework daemon and libraries.
- Name: tests
Group: Development/Libraries
Requires:
- qt5-qttest-devel
- testrunner-lite
- python
Summary: Unit test cases for sensord
Expand Down
12 changes: 6 additions & 6 deletions rpm/sensorfw.spec
@@ -1,6 +1,6 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.25
# Generated by: spectacle version 0.26
#

Name: sensorfw
Expand All @@ -9,7 +9,7 @@ Name: sensorfw
# << macros

Summary: Sensor Framework
Version: 0.7.2.4
Version: 0.7.2.6
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand Down Expand Up @@ -73,7 +73,7 @@ Contains test cases for CI environment, for ensuring that sensord provides conte
%package configs
Summary: Sensorfw configuration files
Group: System/Libraries
BuildArch: noarch
BuildArch: noarch
Requires: %{name} = %{version}
Provides: sensord-config
Provides: config-n900
Expand All @@ -98,7 +98,6 @@ Requires(postun): /sbin/ldconfig
Provides Qt 4 compatibility for Qt 5 Sensorfw files.



%prep
%setup -q -n %{name}-%{version}

Expand Down Expand Up @@ -133,17 +132,18 @@ mkdir -p %{buildroot}/%{_lib}/systemd/system/basic.target.wants
ln -s ../sensord.service %{buildroot}/%{_lib}/systemd/system/basic.target.wants/sensord.service
# << install post


%preun
if [ "$1" -eq 0 ]; then
systemctl stop sensord.service
fi

%post
/sbin/ldconfig
update-contextkit-providers
systemctl daemon-reload
systemctl reload-or-try-restart sensord.service
# >> post
update-contextkit-providers
# << post

%postun
/sbin/ldconfig
Expand Down
3 changes: 2 additions & 1 deletion rpm/sensorfw.yaml
@@ -1,6 +1,6 @@
Name: sensorfw
Summary: Sensor Framework
Version: 0.7.2.4
Version: 0.7.2.6
Release: 0
Group: "System/Sensor Framework"
License: LGPLv2+
Expand All @@ -20,6 +20,7 @@ Requires:
PkgConfigBR:
- QtCore
- gconf-2.0
- QtDeclarative
- contextprovider-1.0

#PkgBR:
Expand Down

0 comments on commit 3014d61

Please sign in to comment.