From 123aa9e09095586411a3cf929a8070d6f3f42c76 Mon Sep 17 00:00:00 2001 From: Maciej Wereski Date: Thu, 2 Jan 2014 10:23:23 +0100 Subject: [PATCH] Adjust SMACK to new model, remove initscripts Also RPMLINT fixes and added changes file. Change-Id: I3a19479eee914af2311bcdf70574f3458f6e84b0 Signed-off-by: Maciej Wereski --- AUTHORS | 0 CMakeLists.txt | 0 LICENSE.Flora | 0 NOTICE | 0 data/CMakeLists.txt | 3 --- data/quickpanel.sh.in | 1 - org.tizen.quickpanel.manifest | 13 ------------- org.tizen.quickpanel.rule | 23 ----------------------- packaging/org.tizen.quickpanel.changes | 3 +++ packaging/org.tizen.quickpanel.manifest | 5 +++++ packaging/org.tizen.quickpanel.spec | 19 +++++-------------- 11 files changed, 13 insertions(+), 54 deletions(-) mode change 100755 => 100644 AUTHORS mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 LICENSE.Flora mode change 100755 => 100644 NOTICE mode change 100755 => 100644 data/CMakeLists.txt delete mode 100644 data/quickpanel.sh.in delete mode 100755 org.tizen.quickpanel.manifest delete mode 100755 org.tizen.quickpanel.rule create mode 100644 packaging/org.tizen.quickpanel.manifest mode change 100755 => 100644 packaging/org.tizen.quickpanel.spec diff --git a/AUTHORS b/AUTHORS old mode 100755 new mode 100644 diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/LICENSE.Flora b/LICENSE.Flora old mode 100755 new mode 100644 diff --git a/NOTICE b/NOTICE old mode 100755 new mode 100644 diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt old mode 100755 new mode 100644 index dcb59c2..57ebfe7 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,9 +3,6 @@ CONFIGURE_FILE(${PROJECT_NAME}.xml.in ${CMAKE_CURRENT_BINARY_DIR}/${VENDOR}.${PROJECT_NAME}.xml) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${VENDOR}.${PROJECT_NAME}.xml DESTINATION ${MANIFESTXMLDIR}) -CONFIGURE_FILE(${PROJECT_NAME}.sh.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME} DESTINATION /etc/init.d/) - #CONFIGURE_FILE(${PROJECT_NAME}.png ${CMAKE_CURRENT_BINARY_DIR}/${VENDOR}.${PROJECT_NAME}.png COPYONLY) #INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${VENDOR}.${PROJECT_NAME}.png DESTINATION "/usr/share/icons/default/small") diff --git a/data/quickpanel.sh.in b/data/quickpanel.sh.in deleted file mode 100644 index cf77090..0000000 --- a/data/quickpanel.sh.in +++ /dev/null @@ -1 +0,0 @@ -@BINDIR@/@PROJECT_NAME@ & diff --git a/org.tizen.quickpanel.manifest b/org.tizen.quickpanel.manifest deleted file mode 100755 index af7de6f..0000000 --- a/org.tizen.quickpanel.manifest +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/org.tizen.quickpanel.rule b/org.tizen.quickpanel.rule deleted file mode 100755 index 8a2c73d..0000000 --- a/org.tizen.quickpanel.rule +++ /dev/null @@ -1,23 +0,0 @@ -org.tizen.quickpanel system::vconf rwxat -org.tizen.quickpanel system::homedir rwxat -org.tizen.quickpanel system::media rwxat -org.tizen.quickpanel system::share rwxat -org.tizen.quickpanel system::use_internet r -org.tizen.quickpanel pulseaudio rwxat -org.tizen.quickpanel xorg rw -org.tizen.quickpanel device::bklight rw -org.tizen.quickpanel org.tizen.indicator rwx -org.tizen.quickpanel crash-popup rx -org.tizen.quickpanel sound_server rwxa -org.tizen.quickpanel dbus rwx -org.tizen.quickpanel e17 rw -org.tizen.quickpanel notification::db rw -org.tizen.quickpanel ail::db rw -org.tizen.quickpanel svi-data rx -org.tizen.quickpanel sys-assert::core rwxat -org.tizen.quickpanel isf rwx -org.tizen.quickpanel media-server rx -org.tizen.quickpanel data-provider-master rw - -e17 org.tizen.quickpanel w -dbus org.tizen.quickpanel rwx diff --git a/packaging/org.tizen.quickpanel.changes b/packaging/org.tizen.quickpanel.changes index 3bce855..d6f3ba3 100644 --- a/packaging/org.tizen.quickpanel.changes +++ b/packaging/org.tizen.quickpanel.changes @@ -1,2 +1,5 @@ +* Thu Jan 02 2014 Maciej Wereski submit/tizen/20130627.143056@65e5018 +- Adjust SMACK to new model, remove initscripts + * Thu Jun 27 2013 Junfeng Dong accepted/tizen/20130530.164708@6366e3a - Fix the build error with glibc 2.17. diff --git a/packaging/org.tizen.quickpanel.manifest b/packaging/org.tizen.quickpanel.manifest new file mode 100644 index 0000000..6c61ae0 --- /dev/null +++ b/packaging/org.tizen.quickpanel.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/org.tizen.quickpanel.spec b/packaging/org.tizen.quickpanel.spec old mode 100755 new mode 100644 index aacee49..ff42531 --- a/packaging/org.tizen.quickpanel.spec +++ b/packaging/org.tizen.quickpanel.spec @@ -6,10 +6,11 @@ Name: org.tizen.quickpanel Summary: Quick Panel Version: 0.3.38 Release: 1 -Group: util -License: Flora Software License +Group: Application Framework/Utilities +License: Flora Source0: %{name}-%{version}.tar.gz Source101: quickpanel.service +Source102: org.tizen.quickpanel.manifest BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-appfw-app-manager) @@ -49,6 +50,7 @@ Quick Panel %prep %setup -q +cp %{SOURCE102} . %build @@ -59,18 +61,11 @@ make %{?jobs:-j%jobs} %install rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc5.d/ -mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/ -ln -s ../../init.d/quickpanel %{buildroot}/%{_sysconfdir}/rc.d/rc5.d/S51quickpanel -ln -s ../../init.d/quickpanel %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S51quickpanel mkdir -p %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants install -m 0644 %SOURCE101 %{buildroot}%{_libdir}/systemd/user/ ln -s ../quickpanel.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/quickpanel.service -mkdir -p %{buildroot}/usr/share/license -cp -f LICENSE.Flora %{buildroot}/usr/share/license/%{name} - %post vconftool set -t bool db/setting/rotate_lock 0 -u 5000 -f vconftool set -t bool db/setting/drivingmode/drivingmode 0 -u 5000 -f @@ -82,15 +77,11 @@ vconftool set -t bool memory/private/%{name}/hotspot/enable_ask 1 -i -u 5000 -f %files %manifest %{name}.manifest %defattr(-,root,root,-) -%attr(755,-,-) %{_sysconfdir}/init.d/quickpanel +%license LICENSE.Flora NOTICE %attr(775,app,app) %{DATADIR} %{DATADIR}/* %{PREFIX}/bin/* %{RESDIR}/* /usr/share/packages/%{name}.xml -%{_sysconfdir}/rc.d/rc3.d/S51quickpanel -%{_sysconfdir}/rc.d/rc5.d/S51quickpanel -%{_sysconfdir}/init.d/quickpanel %{_libdir}/systemd/user/quickpanel.service %{_libdir}/systemd/user/core-efl.target.wants/quickpanel.service -/usr/share/license/%{name} -- 2.7.4