merge with master

diff --git a/AUTHORS b/AUTHORS
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ecd2e8..caad8fb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,13 +57,13 @@ FOREACH(lib_file ${SUBMODULES})
        TARGET_LINK_LIBRARIES(${lib_file} ${pkgs_LDFLAGS} ${PROJECT_NAME}-inter)
        SET_TARGET_PROPERTIES(${lib_file} PROPERTIES SOVERSION ${VERSION_MAJOR})
        SET_TARGET_PROPERTIES(${lib_file} PROPERTIES VERSION ${VERSION})
-       INSTALL(TARGETS ${lib_file} DESTINATION lib COMPONENT RuntimeLibraries)
+       INSTALL(TARGETS ${lib_file} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 ENDFOREACH(lib_file)
 
 FOREACH(pcfile ${SUBMODULES})
        CONFIGURE_FILE(${pcfile}.pc.in ${pcfile}.pc @ONLY)
        SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${pcfile}.pc")
-       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcfile}.pc DESTINATION lib/pkgconfig)
+       INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcfile}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 ENDFOREACH(pcfile)
 
 FOREACH(hfile ${INSTALL_HEADERS})

diff --git a/NOTICE b/NOTICE
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/minicontrol-type.h b/include/minicontrol-type.h
index 6e11521..3aa47b4 100755 (executable)
--- a/include/minicontrol-type.h
+++ b/include/minicontrol-type.h
@@ -52,6 +52,8 @@ typedef enum {
 typedef enum {
        MINICONTROL_REQ_NONE = 0,
        MINICONTROL_REQ_HIDE_VIEWER = 100,
+       MINICONTROL_REQ_FREEZE_SCROLL_VIEWER,
+       MINICONTROL_REQ_UNFREEZE_SCROLL_VIEWER,
 }minicontrol_request_e;
 
 #endif /* _MINICTRL_TYPE_H_ */

diff --git a/packaging/minicontrol.spec b/packaging/minicontrol.spec
index 92a1049..0656596 100755 (executable)
--- a/packaging/minicontrol.spec
+++ b/packaging/minicontrol.spec
@@ -3,7 +3,7 @@ Summary:    minicontrol library
 Version:    0.0.3
 Release:    1
 Group:      TBD
-License:    Flora Software License
+License:    Flora
 Source0:    %{name}-%{version}.tar.gz
 BuildRequires: pkgconfig(dbus-1)
 BuildRequires: pkgconfig(dbus-glib-1)
@@ -12,8 +12,6 @@ BuildRequires: pkgconfig(evas)
 BuildRequires: pkgconfig(ecore-evas)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: cmake
-Requires(post): /sbin/ldconfig
-requires(postun): /sbin/ldconfig
 %description
 Minicontrol library.
 
@@ -29,8 +27,8 @@ Requires:   %{name} = %{version}-%{release}
 Minicontrol library (devel).
 
 %build
-export LDFLAGS+="-Wl,--rpath=%{_prefix}/lib -Wl,--as-needed"
-LDFLAGS="$LDFLAGS" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+export LDFLAGS+="-Wl,--rpath=%{_libdir} -Wl,--as-needed"
+%cmake .
 make %{?jobs:-j%jobs}
 
 %install
@@ -59,4 +57,3 @@ cp -f LICENSE.Flora %{buildroot}/usr/share/license/%{name}
 %{_libdir}/pkgconfig/minicontrol-provider.pc
 %{_libdir}/pkgconfig/minicontrol-monitor.pc
 %{_libdir}/pkgconfig/minicontrol-viewer.pc
-