update: akonadi, shared-desktop-ontologies

NEW: herqq, qtsoap


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4445 ec354946-7b23-47d6-9f5a-488ba84defc7

a/akonadi/akonadi-vl.spec

@@ -3,11 +3,14 @@
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
+## Can be either MYSQL(uptsream default), SQLITE, or POSTGRES(untested)
+%global database_backend SQLITE 
+
 Name:    akonadi
 Summary: PIM Storage Service
 Summary(ja): PIM ストレージサービス
-Version: 1.5.0
-Release: 2%{?_dist_release}
+Version: 1.6.0
+Release: 1%{?_dist_release}
 
 Group:   System Environment/Libraries
 License: LGPLv2+
@@ -15,7 +18,7 @@ URL:     http://download.akonadi-project.org/
 
 Source0: http://download.akonadi-project.org/akonadi-%{version}.tar.bz2
 
-%define mysql_conf_timestamp 20110107
+%define mysql_conf_timestamp 20110629
 # shrink default initial db size a bit (approx 140mb->28mb)
 Patch1: akonadi-mysql_conf.patch
 
@@ -35,29 +38,27 @@ BuildRequires: soprano-devel >= 2.5.0
 BuildRequires: sqlite3-devel
 BuildRequires: libICE-devel libXext-devel
 
-# when/if akonadi grows support for other backends, consider splitting
-# these similar to how phonon is done currently.
+Requires: qt4 = %{_qt4_version}
+
+%if "%{?database_backend}" == "MYSQL"
 Requires: qt4-MySQL
 # not *strictly* required, but we need a functional default configuration
-#Requires: MySQL-server
+Requires: MySQL-server
+%endif
+
+Obsoletes: akonadi-sqlite < %{version}-%{release}
+
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 %description
 %{summary}.
+%if "%{?database_backend}" == "MYSQL"
 Requires an available instance of mysql server at runtime.  
 Akonadi can spawn a per-user one automatically if the mysql-server 
 package is installed on the machine.
 See also: %{_sysconfdir}/akonadi/mysql-global.conf
-
-%package sqlite
-Summary: a sliglty adjusted QSQLITE driver for akonadi
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: qt4 = %{_qt4_version}
-
-%description sqlite
-%{summary}.
+%endif
 
 %package devel
 Summary: Developer files for %{name}
@@ -72,8 +73,8 @@ Requires: qt4-devel
 
 %prep
 %setup -q 
-%patch1 -p1 -b .mysql_conf
-touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
+#%patch1 -p1 -b .mysql_conf
+#touch -d %{mysql_conf_timestamp} server/src/storage/mysql-global.conf
 
 %build
 %ifarch x86_64
@@ -85,6 +86,7 @@ pushd %{_target_platform}
 %cmake \
     -DCONFIG_INSTALL_DIR=%{_sysconfdir} \
     -DINSTALL_QSQLITE_IN_QT_PREFIX:PATH=%{_qt4_plugindir} \
+    %{?database_backend:-DDATABASE_BACKEND=%{database_backend}} \
     ..
 popd
 
@@ -97,7 +99,27 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/akonadi/agents
 
-touch -d %{mysql_conf_timestamp} $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-local.conf
+# create "big" config (analog to -mobile.conf)
+install -p \
+    $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global-big.conf
+
+# default to small/mobile config
+install -p \
+    $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global-mobile.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global.conf
+
+touch -d %{mysql_conf_timestamp} \
+    $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-global*.conf \
+    $RPM_BUILD_ROOT%{_sysconfdir}/akonadi/mysql-local.conf
+
+# create/own %{_libdir}/akondi
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/akonadi
+
+#%check
+#make test -C %{_target_platform}
+#export PKG_CONFIG_PATH=$RPM_BUILD_ROOT%{_datadir}/pkgconfig:$RPM_BUILD_ROOT%{_libdir}/pkgconfig
+#test "$(pkg-config --modversion akonadi)" = "%{version}"
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -118,8 +140,10 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS lgpl-license
 %dir %{_sysconfdir}/akonadi
+# example conf's
+%{_sysconfdir}/akonadi/mysql-global-big.conf
+%{_sysconfdir}/akonadi/mysql-global-mobile.conf
 %config(noreplace) %{_sysconfdir}/akonadi/mysql-global.conf
-%config(noreplace) %{_sysconfdir}/akonadi/mysql-global-mobile.conf
 %config(noreplace) %{_sysconfdir}/akonadi/mysql-local.conf
 %{_bindir}/akonadi_agent_launcher
 %{_bindir}/akonadi_agent_server
@@ -132,9 +156,6 @@ fi
 %{_datadir}/dbus-1/services/org.freedesktop.Akonadi.*.service
 %{_datadir}/mime/packages/akonadi-mime.xml
 %{_datadir}/akonadi
-
-%files sqlite
-%defattr(-,root,root,-)
 %{_qt4_plugindir}/sqldrivers/libqsqlite3.so
 
 %files devel
@@ -146,6 +167,9 @@ fi
 
 
 %changelog
+* Sat Jul 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.0-1
+- new upstream release
+
 * Thu Mar 10 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.5.0-2
 - rebuilt with qt4-4.7.2
 

h/herqq/herqq-vl.spec

@@ -0,0 +1,84 @@
+%define _qt4_ver 4.7.2
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
+%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
+%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
+
+
+Name:           herqq
+Summary:        A software library for building UPnP devices and control points
+Version:        1.0.0
+Release:        2%{?_dist_release}
+
+# test application is GPLv3 but we do not ship it
+License:        LGPLv3+
+URL:            http://herqq.org/
+Source0:        http://downloads.sourceforge.net/project/hupnp/hupnp/%{name}-%{version}.zip
+Patch2:         herqq-1.0.0-qtsoap-library.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  desktop-file-utils
+BuildRequires:  qt4-devel
+BuildRequires:  qtsoap-devel
+Requires: qt4 >= %{_qt4_version}
+
+%description
+Herqq UPnP (HUPnP) is a software library for building UPnP 
+devices and control points conforming to the UPnP Device 
+Architecture version 1.1. 
+
+%package devel
+Summary:  Development files for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: qt4-devel = %{_qt4_version}
+
+%description devel
+Header files for developing applications using %{name}.
+
+%prep
+%setup -q
+
+# lQtSolutions to lqtsoap
+%patch2 -p1 -b .qtsoap-library
+
+%build
+# we have to disable bundled QtSOAP library
+qmake PREFIX=%{_prefix} -config DISABLE_QTSOAP \
+    -config DISABLE_TESTAPP -config USE_QT_INSTALL_LOC
+make %{?_smp_mflags}
+
+%install
+make INSTALL_ROOT=%{buildroot} install
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc hupnp/ChangeLog hupnp/LICENSE_LGPLv3.txt
+%{_qt4_libdir}/libHUpnp.so.1*
+
+%files devel
+%{_qt4_libdir}/libHUpnp.so
+%{_qt4_headerdir}/HUpnpCore/
+
+%changelog
+* Sat Jul 31 2011 Ryoiochi INAGAKI <ryo1@bc.wakwak.com> - 1.0.0-2
+- Initial build for Vine Linux
+
+* Wed Jul 20 2011 Jaroslav Reznik <jreznik@redhat.com> - 1.0.0-1
+- post-review update to 1.0.0
+
+* Wed Jul 20 2011 Jaroslav Reznik <jreznik@redhat.com> - 0.9.1-3
+- fix license to LGPLv3+
+- qt4 header dir for consistency
+- shlib soname tracked in %files
+- -devel should not duplicate COPYING
+
+* Tue Jul 19 2011 Jaroslav Reznik <jreznik@redhat.com> - 0.9.1-2
+- qtsoap library
+- cleanup SPEC file
+
+* Tue Feb 22 2011 Jaroslav Reznik <jreznik@redhat.com> - 0.9.1-1
+- Initial spec file 

q/qtsoap/qtsoap-vl.spec

@@ -0,0 +1,90 @@
+%define _qt4_ver 4.7.2
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_version})
+%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
+
+Name:           qtsoap
+Summary:        The Simple Object Access Protocol Qt-based client side library
+Version:        2.7
+Release:        3%{?_dist_release}
+
+Group:          System Environment/Libraries
+License:        LGPLv2 with exceptions or GPLv3
+URL:            http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsoap/
+
+Source0:        http://get.qt.nokia.com/qt/solutions/lgpl/qtsoap-%{version}_1-opensource.tar.gz
+Patch0:         qtsoap-2.7_1-opensource-install-pub-headers.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  qt4-devel
+
+%description
+The SOAP (Simple Object Access Protocol) library uses the XML standard
+for describing how to exchange messages. Its primary usage is to invoke web
+services and get responses from Qt-based applications.
+
+%package        devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       qt4-devel = %{_qt4_version}
+
+%description    devel
+Development files for %{name}.
+
+%prep
+%setup -q -n qtsoap-%{version}_1-opensource
+
+# headers are not installed for shared library
+%patch0 -p1 -b .install-pub-headers
+
+sed -i 's:$$DESTDIR:%{_libdir}:g' buildlib/buildlib.pro
+
+%build
+# we want shared library
+echo "SOLUTIONS_LIBRARY = yes" > config.pri
+
+echo "QTSOAP_LIBNAME = \$\$qtLibraryTarget(qtsoap)" >> common.pri
+echo "VERSION=%{version}" >> common.pri
+
+qmake PREFIX=%{_prefix}
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make INSTALL_ROOT=%{buildroot} install
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%doc README.TXT LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL
+%{_libdir}/libqtsoap.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL
+%{_libdir}/libqtsoap.so
+%{_qt4_headerdir}/QtSoap/
+
+%changelog
+* Sat Jul 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 2.7-3
+- Initial build for Vine Linux
+
+* Thu Jul 14 2011 Jaroslav Reznik <jreznik@redhat.com> - 2.7-2
+- libqtsoap library name
+
+* Thu May 19 2011 Jaroslav Reznik <jreznik@redhat.com> - 2.7-1
+- fix version
+
+* Tue Oct 26 2010 Jaroslav Reznik <jreznik@redhat.com> - 1.7-1
+- Initial spec file

s/shared-desktop-ontologies/shared-desktop-ontologies-vl.spec

@@ -1,6 +1,6 @@
 Name:           shared-desktop-ontologies
 Summary:        Shared ontologies needed for semantic environments
-Version:        0.6.0
+Version:        0.7.1
 Release:        1%{?_dist_release}
 
 Group:          User Interface/Desktops
@@ -34,7 +34,6 @@ semantic desktops. Although initially designed to fulfill requirements
 for the Nepomuk project, these ontologies are useful for the semantic
 web community in general.
 
-
 %package        devel
 Summary:        Development files for %{name}
 Summary(ja):    %{name} の開発用ファイル
@@ -42,9 +41,8 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-The %{name}-devel package contains libraries
-and header files for developing applications
-that use %{name}.
+The %{name}-devel package contains libraries and header files for 
+developing applications that use %{name}.
 
 
 %prep
@@ -72,6 +70,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jul 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.7.1-1
+- new upstream release
+
 * Fri Mar  4 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.6.0-1
 - new upstream release