0.1.1-1

- 1.1.1 release
- support QT4_BUILD option
- fix dso patch
- Provides: libqaccessibilityclient(-devel)

.gitignore

@@ -1 +1 @@
-/qaccessibilityclient-0.1.0-20121113git.tar.xz
+/libqaccessibilityclient-0.1.1.tar.bz2

libqaccessibilityclient-0.1.1-QT4_BUILD.patch

@@ -0,0 +1,22 @@
+diff -up libqaccessibilityclient-0.1.1/CMakeLists.txt.qt4 libqaccessibilityclient-0.1.1/CMakeLists.txt
+--- libqaccessibilityclient-0.1.1/CMakeLists.txt.qt4	2014-02-07 10:24:10.000000000 -0600
++++ libqaccessibilityclient-0.1.1/CMakeLists.txt	2014-02-12 22:13:56.002246423 -0600
+@@ -14,15 +14,17 @@ set(CMAKE_AUTOMOC TRUE)
+ 
+ # override the KDE defaults and build tests unless explicitly disabled
+ option(KDE4_BUILD_TESTS  "Build the tests" ON)
++option(QT4_BUILD "Force building with Qt4 even if Qt5 is found")
+ 
+ include_directories(
+     ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
+ )
+ 
++if (NOT QT4_BUILD)
+ find_package(Qt5Widgets QUIET)
+ find_package(Qt5DBus QUIET)
+-
++endif()
+ 
+ if (${Qt5Widgets_FOUND} AND ${Qt5DBus_FOUND})
+     set(QT5_BUILD True)

qaccessibilityclient-0.1.0-dso.patch

@@ -7,7 +7,7 @@ diff -up qaccessibilityclient-0.1.0/src/CMakeLists.txt.dso qaccessibilityclient-
      target_link_libraries(qaccessibilityclient ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5DBus_LIBRARIES})
  else (QT5_BUILD)
 -    target_link_libraries(qaccessibilityclient ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})
-+    target_link_libraries(qaccessibilityclient ${QT_QTCORE_LIBRARY} ${QT_GUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
++    target_link_libraries(qaccessibilityclient ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
  endif(QT5_BUILD)
  
  set(QACCESSIBILITYCLIENT_SOVERSION ${QACCESSIBILITYCLIENT_VERSION_MAJOR})

qaccessibilityclient.spec

@@ -1,23 +1,29 @@
 
-%define snap 20121113git
-
 Name:    qaccessibilityclient
 Summary: Accessibility client library for Qt
-Version: 0.1.0
-Release: 0.3.%{snap}%{?dist}
+Version: 0.1.1
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future LGPL versions are accepted
 License: LGPLv2 or LGPLv3
 URL:     https://projects.kde.org/projects/playground/accessibility/libkdeaccessibilityclient
+%if 0%{?snap}
 Source0: qaccessibilityclient-%{version}-%{snap}.tar.xz
+%else
+Source0: http://download.kde.org/stable/libqaccessibilityclient/libqaccessibilityclient-%{version}.tar.bz2
+%endif
 Source1: qaccessibilityclient_snapshot.sh
 
 ## upstreamable patches
 # link QtGui for undefined symbols
 Patch50: qaccessibilityclient-0.1.0-dso.patch
+# QT4_BUILD option
+Patch51: libqaccessibilityclient-0.1.1-QT4_BUILD.patch
 
 BuildRequires: cmake >= 2.8.6
-BuildRequires: qt4-devel
+BuildRequires: pkgconfig(QtDBus) pkgconfig(QtGui)
+
+Provides: libqaccessibilityclient = %{version}-%{release}
 
 %description
 %{summary}.
@@ -25,22 +31,25 @@ BuildRequires: qt4-devel
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: cmake
+Provides: libqaccessibilityclient-devel = %{version}-%{release}
 Requires: qt4-devel
 %description  devel
 %{summary}.
 
 
 %prep
-%setup -q
+%setup -q -n libqaccessibilityclient-%{version}
 
 %patch50 -p1 -b .dso
+%patch51 -p1 -b .QT4_BUILD
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} ..
+%{cmake} \
+  -DQT4_BUILD:BOOL=ON \
+  ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -63,11 +72,18 @@ rm -f %{buildroot}%{_bindir}/accessibleapps
 
 %files devel
 %{_includedir}/qaccessibilityclient/
+%dir %{_libdir}/cmake/
 %{_libdir}/cmake/QAccessibilityClient/
 %{_libdir}/libqaccessibilityclient.so
 
 
 %changelog
+* Wed Feb 12 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.1.1-1
+- 1.1.1 release
+- support QT4_BUILD option
+- fix dso patch
+- Provides: libqaccessibilityclient(-devel)
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.0-0.3.20121113git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-94beaa55d13f1d2136623d4b335850d9  qaccessibilityclient-0.1.0-20121113git.tar.xz
+757ab7c4844c1a6220176b0f1a1bd08c  libqaccessibilityclient-0.1.1.tar.bz2