rpms/dbus-qt3/F-7 dbus-qt3-svn_checkout.sh, NONE, 1.1 .cvsignore, 1.2, 1.3 dbus-qt3.spec, 1.1, 1.2 sources, 1.2, 1.3

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Jun 3 16:27:28 UTC 2008


Author: rdieter

Update of /cvs/pkgs/rpms/dbus-qt3/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24347

Modified Files:
	.cvsignore dbus-qt3.spec sources 
Added Files:
	dbus-qt3-svn_checkout.sh 
Log Message:
* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.1-1.20080603svn
- 20080603svn snapshot



--- NEW FILE dbus-qt3-svn_checkout.sh ---
#/bin/sh

DATE=$(date +%Y%m%d)
EXPORT_DIR=dbus-qt3

set -x
rm -rf $EXPORT_DIR
# app
svn export svn://anonsvn.kde.org/home/kde/branches/work/dbus-qt4-qt3backport $EXPORT_DIR/

# docs
# auto*/configure bits
svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin $EXPORT_DIR/admin/

tar cjf $EXPORT_DIR-${DATE}svn.tar.bz2 $EXPORT_DIR

# cleanup
rm -rf $EXPORT_DIR



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-qt3/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	28 Jan 2008 16:23:28 -0000	1.2
+++ .cvsignore	3 Jun 2008 16:26:46 -0000	1.3
@@ -1 +1 @@
-libdbus-1-qt3-0.8.tar.gz
+dbus-qt3-20080603svn.tar.bz2


Index: dbus-qt3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-qt3/F-7/dbus-qt3.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dbus-qt3.spec	28 Jan 2008 16:23:28 -0000	1.1
+++ dbus-qt3.spec	3 Jun 2008 16:26:46 -0000	1.2
@@ -1,19 +1,29 @@
 
 # fedora package review: http://bugzilla.redhat.com/429760
 
+%define qt3pkg qt
+%if 0%{?fedora} > 8
+%define qt3pkg qt3
+%endif
+
+%define svn 20080603svn
+
 Name:    dbus-qt3
 Summary: Qt3 DBus Bindings
-Version: 0.8
-Release: 2%{?dist}
+Version: 0.8.1
+Release: 1.%{svn}%{?dist}
 
 License: GPLv2+
 Group:   System Environment/Libraries 
 Url:     http://www.freedesktop.org/wiki/Software/DBusBindings
-Source0: http://people.freedesktop.org/~krake/dbus-1-qt3/libdbus-1-qt3-%{version}.tar.gz 
+#Source0: http://people.freedesktop.org/~krake/dbus-1-qt3/libdbus-1-qt3-%{version}.tar.bz2
+Source0: dbus-qt3-20080603svn.tar.bz2 
+Source1: dbus-qt3-svn_checkout.sh 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires: automake libtool
 BuildRequires: dbus-devel
-BuildRequires: qt-devel
+BuildRequires: %{qt3pkg}-devel
 
 #Obsoletes: libdbus-1-qt3 < %{version}-%{release}
 Provides: libdbus-1-qt3 = %{version}-%{release}
@@ -28,35 +38,34 @@
 Provides: libdbus-1-qt3-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel
-Requires: qt-devel
+Requires: %{qt3pkg}-devel
 Requires: pkgconfig
 %description devel
 %{summary}.
 
 
 %prep
-%setup -q -n libdbus-1-qt3-%{version}
+#setup -q -n libdbus-1-qt3-%{version}
+%setup -q -n dbus-qt3
+
+make -f admin/Makefile.common
 
 
 %build
+
+
 %configure \
-  --disable-static
+  --disable-static \
+  --disable-warnings
 
 make %{?_smp_mflags}
 
-pushd tools/dbusxml2qt3
-qmake
-make
-popd
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -D -m 0755 ./tools/dbusxml2qt3/dbusxml2qt3 $RPM_BUILD_ROOT%{_bindir}/dbusxml2qt3
-
 # unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
@@ -77,7 +86,6 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc COPYING
 %{_bindir}/dbusxml2qt3
 %{_libdir}/lib*.so
 %{_includedir}/dbus-1.0/qt3/
@@ -85,6 +93,21 @@
 
 
 %changelog
+* Tue Jun 03 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.1-1.20080603svn
+- 20080603svn snapshot
+
+* Tue Mar 25 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8-5
+- s/qt-devel/qt3-devel/ (f9+)
+
+* Tue Feb 05 2008 Dennis Gilmore <dennis at ausil.us> 0.8-4
+- actually apply the patch
+- add second patch from suse
+
+* Tue Feb 05 2008 Dennis Gilmore <dennis at ausil.us> 0.8-3
+- apply BRANCH_UPDATE.diff pulled from suse
+- patch needed because it changes the opttions to dbusxml2qt3 
+- knm  needs the new calls
+
 * Sun Jan 27 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8-2
 - Provides: libdbus-1-qt3(-devel)
 - fix mixed tabs/spaces


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dbus-qt3/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	28 Jan 2008 16:23:28 -0000	1.2
+++ sources	3 Jun 2008 16:26:46 -0000	1.3
@@ -1 +1 @@
-f83d60d0f8cc0dfee933e221decaae86  libdbus-1-qt3-0.8.tar.gz
+3ae5ab8e53a3d02b46ac9ac66ceaaee7  dbus-qt3-20080603svn.tar.bz2




More information about the fedora-extras-commits mailing list