[meego-commits] 14601: Changes to Trunk/libqttracker

[Peter Zhu]

Hi,
I have made the following changes to libqttracker in project Trunk. Please review and accept ASAP.

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #14601:

  submit:   Trunk:Testing/libqttracker(r2) -> Trunk/libqttracker


Message:
    Move to Trunk

State:   new          2011-03-08T08:18:02 peter
Comment: None



changes files:
--------------
--- libqttracker.changes
+++ libqttracker.changes
@@ -0,0 +1,7 @@
+* Thu Mar 03 2011 Fathi Boudra <fathi.boudra at nokia.com> - 6.12.6
+- Use PkgConfigBR QtSparql instead of PkgConfig libqtsparl-devel
+- Use qmake builder
+- Move documentation in its own package
+- Fix libqttracker-6.12.1-fixing-make-install.patch to avoid invalid character
+  under windows filesystem (BMC#13328)
+

spec files:
-----------
--- libqttracker.spec
+++ libqttracker.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.20
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 # << macros
@@ -21,12 +21,11 @@
 Requires:   %{name} >= %{version}
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-BuildRequires:  pkgconfig(QtGui)
 BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(QtSparql)
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  doxygen
 BuildRequires:  tracker >= 0.7.0
-BuildRequires:  libqtsparql-devel
 BuildRequires:  fdupes
 
 
@@ -45,6 +44,16 @@
 Tracker for discovering media on a device and extracting media metadata.
 
 
+%package doc
+Summary:    Qt Tracker documentation
+Group:      Documentation
+BuildArch:    noarch
+Requires:   %{name} = %{version}-%{release}
+
+%description doc
+This package contains the documentation for Qt Tracker.
+
+
 %package tests
 Summary:    Qt Tracker testsuite
 Group:      System/X11
@@ -72,27 +81,28 @@
 
 %build
 # >> build pre
-%qmake
-make %{?jobs:-j%jobs}
-make doc && make dev-doc
 # << build pre
 
+%qmake 
 
+make %{?jobs:-j%jobs}
 
 # >> build post
+make doc
 # << build post
 %install
 rm -rf %{buildroot}
 # >> install pre
 # << install pre
+%qmake_install
 
 # >> install post
-%qmake_install
 sed -i 's,-L/home/abuild/[^ ]*,,' %{buildroot}/%{_libdir}/pkgconfig/*.pc
-# << install post
-%fdupes  %{buildroot}/%{_includedir}
 mv %{buildroot}/%{_datadir}/libqttracker-tests %{buildroot}/%{_libdir}/libqttracker-tests 
 chmod 755 %{buildroot}/%{_libdir}/libqttracker-tests/benchmarking/runall.py
+# << install post
+%fdupes  %{buildroot}/%{_includedir}
+
 
 
 %post -p /sbin/ldconfig
@@ -106,6 +116,9 @@
 
 
 
+
+
+
 %files
 %defattr(-,root,root,-)
 # >> files
@@ -120,9 +133,14 @@
 %{_libdir}/libqttracker.prl
 %{_libdir}/pkgconfig/qttracker.pc
 %{_includedir}/QtTracker
-%doc  %{_datadir}/doc/libqttracker-doc/*
 # << files devel
 
+%files doc
+%defattr(-,root,root,-)
+# >> files doc
+%doc %{_datadir}/doc/libqttracker-doc/
+# << files doc
+
 %files tests
 %defattr(-,root,root,-)
 # >> files tests
@@ -130,6 +148,6 @@
 %{_bindir}/qttracker-util-tests
 %{_bindir}/qttracker-perf-tests
 %{_bindir}/qttracker-unit-tests
-%{_libdir}/libqttracker-tests/*
+%{_libdir}/libqttracker-tests/
 # << files tests
 

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

++++++ libqttracker-6.12.1-fixing-make-install.patch
--- libqttracker-6.12.1-fixing-make-install.patch
+++ libqttracker-6.12.1-fixing-make-install.patch
@@ -1,14 +1,11 @@
-diff -Naur ../libqttracker-6.12.1//doc/doc.pri libqttracker-6.12.1//doc/doc.pri
---- ../libqttracker-6.12.1//doc/doc.pri	2010-11-15 17:03:17.000000000 +0200
-+++ libqttracker-6.12.1//doc/doc.pri	2010-11-26 09:08:19.580184001 +0200
-@@ -2,8 +2,8 @@
+--- a/doc/doc.pri
++++ b/doc/doc.pri
+@@ -2,7 +2,7 @@ doxygen_doc.target = doc/html/index.html
  doxygen_doc.commands = cd doc && VERSION=\"$$VERSION\" LIBRARYNAME=\"$$LIBRARYNAME\" doxygen doxygen.cfg
  doc.depends = doxygen_doc
  
 -install_doc.files = doc/html
--install_doc.path = $$PREFIX/share/doc/$$PACKAGENAME-doc/
 +install_doc.files = doc/html/*
-+install_doc.path = $$PREFIX/share/doc/$$PACKAGENAME-doc/*
+ install_doc.path = $$PREFIX/share/doc/$$PACKAGENAME-doc/
  install_doc.CONFIG = no_check_exist
  INSTALLS += install_doc
- 

++++++ libqttracker.yaml
--- libqttracker.yaml
+++ libqttracker.yaml
@@ -19,14 +19,14 @@
 PkgBR:
     - doxygen
     - tracker >= 0.7.0
-    - libqtsparql-devel 
 PkgConfigBR:
-    - QtGui
     - QtCore
+    - QtSparql
     - uuid
 Configure: none
-Builder: none
-RunFdupes: "%{_includedir}"
+Builder: qmake
+RunFdupes:
+    - "%{_includedir}"
 SubPackages:
     - Name: devel
       Summary: Qt Tracker development files
@@ -35,8 +35,17 @@
           This package contains the files necessary to develop Qt applications that use
           Tracker for discovering media on a device and extracting media metadata.
 
+    - Name: doc
+      Summary: Qt Tracker documentation
+      Group: Documentation
+      BuildArch: noarch
+      Description: |
+          This package contains the documentation for Qt Tracker.
+
     - Name: tests
       Summary: Qt Tracker testsuite
       Group: System/X11
       Description: |
           This package contains the testsuite for Qt Tracker.
+      Requires:
+          - libqtsparql-tracker-direct