[meego-commits] 10771: Changes to devel:qt-mtf/meegotouch-controlpanel

[Gabor Juhasz]

Hi,
I have made the following changes to meegotouch-controlpanel in project devel:qt-mtf. Please review and accept ASAP.

Thank You,
Gabor Juhasz

[This message was auto-generated]

---

Request #10771:

  submit:   home:gabor:branches:devel:qt-mtf/meegotouch-controlpanel(r2)(cleanup) -> devel:qt-mtf/meegotouch-controlpanel


Message:
    * Thu Dec 09 2010 Gabor Juhasz <ext-gabor.2.juhasz at nokia.com> - 0.9.4.2
- BMC#11099, new version of mcp : 0.9.4.2
- Add meegotouch-controlpanel.pc symlink into pkconfig directory

State:   new          2010-12-09T07:31:48 gabor
Comment: None



changes files:
--------------
--- meegotouch-controlpanel.changes
+++ meegotouch-controlpanel.changes
@@ -0,0 +1,4 @@
+* Thu Dec 09 2010 Gabor Juhasz <ext-gabor.2.juhasz at nokia.com> - 0.9.4.2
+- BMC#11099, new version of mcp : 0.9.4.2
+- Add meegotouch-controlpanel.pc symlink into pkconfig directory
+

old:
----
  meegotouch-controlpanel-0.9.4.1.tar.bz2

new:
----
  meegotouch-controlpanel-0.9.4.2.tar.bz2

spec files:
-----------
--- meegotouch-controlpanel.spec
+++ meegotouch-controlpanel.spec
@@ -7,7 +7,7 @@
 
 Name:       meegotouch-controlpanel
 Summary:    MeeGo Control Panel
-Version:    0.9.4.1
+Version:    0.9.4.2
 Release:    1
 Group:      System/Libraries
 License:    LGPLv2.1
@@ -122,20 +122,6 @@
 %qmake_install
 
 # >> install post
-# meegotouchcontrolpanel.pc
-mkdir -p %{buildroot}%{_libdir}/pkgconfig
-cat > %{buildroot}%{_libdir}/pkgconfig/meegotouch-controlpanel.pc << EOF
-prefix=%{_usr}
-exec_prefix=%{_usr}
-libdir=%{_libdir}
-includedir=%{_includedir}/duicontrolpanel
-
-Name: meegotouch-controlpanel
-Description: MeeGo Control Panel
-Version: %{version}
-Requires: QtGui
-Cflags: -I${includedir}
-EOF
 # << install post
 desktop-file-install --delete-original       \
   --dir %{buildroot}%{_datadir}/applications             \
@@ -173,13 +159,13 @@
 %defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/duicontrolpanel*
 %{_datadir}/themes/base/meegotouch/duicontrolpanel/style/duicontrolpanel.*
-%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/*
-%{_datadir}/themes/base/meegotouch/duicontrolpanel/svg/*
-%{_datadir}/themes/base/meegotouch/duicontrolpanel/duicontrolpanel.conf
 %{_datadir}/applications/duicontrolpanel.desktop
 %{_libdir}/duicontrolpanel/applets/libdeclarative.so
 %{_datadir}/dbus-1/*
 %{_sysconfdir}/meego-rfs-scripts/controlpanel-rfs.sh
+%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/*
+%{_datadir}/themes/base/meegotouch/duicontrolpanel/svg/*
+%{_datadir}/themes/base/meegotouch/duicontrolpanel/duicontrolpanel.conf
 # >> files
 # << files
 
@@ -197,6 +183,7 @@
 %{_libdir}/libduicontrolpanel.so
 %{_includedir}/duicontrolpanel/*
 %{_datadir}/qt4/mkspecs/*
+%{_libdir}/pkgconfig/duicontrolpanel.pc
 %{_libdir}/pkgconfig/meegotouch-controlpanel.pc
 # >> files libmeegocontrolpanel-devel
 # << files libmeegocontrolpanel-devel

other changes:
--------------

++++++ meegotouch-controlpanel-0.9.4.1.tar.bz2 -> meegotouch-controlpanel-0.9.4.2.tar.bz2
--- lib/src/src.pro
+++ lib/src/src.pro
@@ -79,13 +79,17 @@
 QMAKE_CLEAN += .objects/.* .objects/*
 
 # create pkg-config info:
-#CONFIG += create_pc create_prl no_install_prl
+CONFIG += create_pc create_prl no_install_prl
 
-#QMAKE_PKGCONFIG_NAME = meegotouch-controlpanel
-#QMAKE_PKGCONFIG_DESCRIPTION = MeeGo Control Panel
-#PKG_CONFIG_PATH = $$[QT_INSTALL_LIBS]/pkgconfig
-#QMAKE_PKGCONFIG_REQUIRES = meegotouch
-#QMAKE_PKGCONFIG_LIBDIR = $$target.path
-#QMAKE_PKGCONFIG_INCDIR = $$install_headers.path
-#QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+QMAKE_PKGCONFIG_NAME = meegotouch-controlpanel
+QMAKE_PKGCONFIG_DESCRIPTION = MeeGo Control Panel
+PKG_CONFIG_PATH = $$[QT_INSTALL_LIBS]/pkgconfig
+QMAKE_PKGCONFIG_REQUIRES = meegotouch
+QMAKE_PKGCONFIG_LIBDIR = $$target.path
+QMAKE_PKGCONFIG_INCDIR = $$install_headers.path
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 
+pcfilelink.commands += $(SYMLINK) "$$TARGET".pc "$$QMAKE_PKGCONFIG_NAME".pc & mv "$$QMAKE_PKGCONFIG_NAME".pc $(INSTALL_ROOT)/$$[QT_INSTALL_LIBS]/pkgconfig/
+pcfilelink.path += $$[QT_INSTALL_LIBS]/pkgconfig
+
+INSTALLS += pcfilelink

++++++ meegotouch-controlpanel.yaml
--- meegotouch-controlpanel.yaml
+++ meegotouch-controlpanel.yaml
@@ -1,6 +1,6 @@
 Name: meegotouch-controlpanel
 Summary: MeeGo Control Panel
-Version: 0.9.4.1
+Version: 0.9.4.2
 Release: 1
 Group: System/Libraries
 License: LGPLv2.1
@@ -25,13 +25,13 @@
 Files:
     - "%attr(755,root,root) %{_bindir}/duicontrolpanel*"
     - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/style/duicontrolpanel.*"
-    - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/*"
-    - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/svg/*"
-    - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/duicontrolpanel.conf"
     - "%{_datadir}/applications/duicontrolpanel.desktop"
     - "%{_libdir}/duicontrolpanel/applets/libdeclarative.so"
     - "%{_datadir}/dbus-1/*"
     - "%{_sysconfdir}/meego-rfs-scripts/controlpanel-rfs.sh"
+    - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/images/*"
+    - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/svg/*"
+    - "%{_datadir}/themes/base/meegotouch/duicontrolpanel/duicontrolpanel.conf"
 
 SubPackages:  
  - Name: libmeegocontrolpanel
@@ -57,6 +57,7 @@
        - "%{_libdir}/libduicontrolpanel.so"
        - "%{_includedir}/duicontrolpanel/*"
        - "%{_datadir}/qt4/mkspecs/*"
+       - "%{_libdir}/pkgconfig/duicontrolpanel.pc"
        - "%{_libdir}/pkgconfig/meegotouch-controlpanel.pc"
    Description: |
        Development files for the control panel application and its applets