diff --git a/.gitignore b/.gitignore index c71a5ce..2c0ba82 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gwenhywfar-3.11.3.tar.gz +/gwenhywfar-4.0.5.tar.gz diff --git a/gwenhywfar.spec b/gwenhywfar.spec index 3d2a0a5..1502d65 100644 --- a/gwenhywfar.spec +++ b/gwenhywfar.spec @@ -1,7 +1,7 @@ Summary: A multi-platform helper library for other libraries Name: gwenhywfar -Version: 3.11.3 -Release: 3%{?dist} +Version: 4.0.5 +Release: 1%{?dist} # Download is PHP form at http://www.aquamaniac.de/sites/download/packages.php Source: %{name}-%{version}.tar.gz Group: System Environment/Libraries @@ -11,6 +11,7 @@ Patch2: gwen-open.patch URL: http://www.aquamaniac.de/sites/download/packages.php?package=01&showall=1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnutls-devel gettext libgcrypt-devel openssl-devel +BuildRequires: gtk2-devel, qt4-devel Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -28,6 +29,20 @@ Requires: pkgconfig This package contains gwenhywfar-config and header files for writing and compiling programs using Gwenhywfar. +%package gui-gtk2 +Summary: Gwenhywfar GUI framework for GTK2 +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +%description gui-gtk2 +This package contains the gtk2 gwenhywfar GUI backend. + +%package gui-qt4 +Summary: Gwenhywfar GUI framework for Qt4 +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +%description gui-qt4 +This package contains the qt4 gwenhywfar GUI backend. + %prep %setup -q @@ -35,7 +50,8 @@ compiling programs using Gwenhywfar. %patch -p1 -b .pkgconfig %build -%configure --disable-static --with-openssl-libs=%{_libdir} +%configure --disable-static --with-openssl-libs=%{_libdir} \ + --with-qt4-libs=%{_qt4_libdir} --with-qt4-includes=%{_qt4_headerdir} sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make @@ -53,8 +69,16 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \; %post -p /sbin/ldconfig +%post gui-gtk2 -p /sbin/ldconfig + +%post gui-qt4 -p /sbin/ldconfig + %postun -p /sbin/ldconfig +%postun gui-gtk2 -p /sbin/ldconfig + +%postun gui-qt4 -p /sbin/ldconfig + %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS README COPYING ChangeLog @@ -63,18 +87,30 @@ find $RPM_BUILD_ROOT -name *.la -exec rm -f {} \; %{_libdir}/%{name} %{_datadir}/%{name} %exclude %{_datadir}/%{name}/typemaker* +%exclude %{_libdir}/*gui-*.so.* %files devel %defattr(-,root,root) %exclude %{_bindir}/gct-tool %{_bindir}/* -%{_includedir}/gwenhywfar3 +%{_includedir}/gwenhywfar4 %{_libdir}/*.so %{_libdir}/pkgconfig/* %{_datadir}/aclocal/gwenhywfar.m4 %{_datadir}/%{name}/typemaker* +%files gui-gtk2 +%defattr(-,root,root) +%{_libdir}/libgwengui-gtk2.so.* + +%files gui-qt4 +%defattr(-,root,root) +%{_libdir}/libgwengui-qt4.so.* + %changelog +* Fri Feb 11 2011 Bill Nottingham - 4.0.5-1 +- update to latest upstream + * Wed Feb 09 2011 Fedora Release Engineering - 3.11.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index e811c00..f8f3af1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ab62d881a0f39d4b07ea0badff7201f gwenhywfar-3.11.3.tar.gz +e9f707a2a01ec1b4fc1576b1c2f5980b gwenhywfar-4.0.5.tar.gz