rpms/qt/F-9 .cvsignore, 1.37, 1.38 qt.spec, 1.191, 1.192 sources, 1.40, 1.41

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27750

Modified Files:
	.cvsignore qt.spec sources 
Log Message:
* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
- qt-copy-patches-20090129

* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
- Provides: qt4%%{?_isa} = %%version-%%release
- add %%_qt4 to macros.qt4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	13 Jan 2009 20:10:20 -0000	1.37
+++ .cvsignore	29 Jan 2009 19:49:39 -0000	1.38
@@ -1,5 +1,4 @@
 hi128-app-qt4-logo.png
 hi48-app-qt4-logo.png
 qt-x11-opensource-src-4.4.3.tar.bz2
-qt-copy-patches-20081225svn.tar.bz2
-qt-copy-patches-20090112svn.tar.bz2
+qt-copy-patches-20090129svn.tar.bz2


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/qt.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- qt.spec	13 Jan 2009 20:10:20 -0000	1.191
+++ qt.spec	29 Jan 2009 19:49:39 -0000	1.192
@@ -9,7 +9,7 @@
 Name:    qt4
 %endif
 Version: 4.4.3
-Release: 10%{?dist}
+Release: 14%{?dist}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 with exceptions or GPLv2 with exceptions
@@ -21,6 +21,7 @@
 %if "%{name}" != "qt4"
 Obsoletes: qt4 < %{version}-%{release}
 Provides: qt4 = %{version}-%{release}
+%{?_isa:Provides: qt4%{?_isa} = %{version}-%{release}}
 %endif
 
 Source4: Trolltech.conf
@@ -39,7 +40,7 @@
 Patch10: qt-x11-opensource-src-4.4.3-im.patch
 
 ## qt-copy patches
-%define qt_copy 20090112
+%define qt_copy 20090129
 Source1: qt-copy-patches-svn_checkout.sh
 %{?qt_copy:Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2}
 %{?qt_copy:Provides: qt-copy = %{qt_copy}}
@@ -78,6 +79,7 @@
 %endif
 
 # See http://bugzilla.redhat.com/196901
+%define _qt4 %{name}
 %define _qt4_prefix %{_libdir}/qt4
 %define _qt4_bindir %{_qt4_prefix}/bin
 # _qt4_datadir is not multilib clean, and hacks to workaround that breaks stuff.
@@ -514,6 +516,7 @@
 # rpm macros
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat >%{buildroot}%{_sysconfdir}/rpm/macros.qt4<<EOF
+%%_qt4 %{name}
 %%_qt4_version %{version}
 %%_qt4_prefix %%{_libdir}/qt4
 %%_qt4_bindir %%{_qt4_prefix}/bin
@@ -731,6 +734,19 @@
 
 
 %changelog
+* Thu Jan 29 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-14
+- qt-copy-patches-20090129
+
+* Mon Jan 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-13
+- Provides: qt4%%{?_isa} = %%version-%%release
+- add %%_qt4 to macros.qt4
+
+* Thu Jan 22 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-12 
+- respin (mysql)
+
+* Fri Jan 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.3-11
+- rebuild for new OpenSSL
+
 * Mon Jan 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.4.3-10
 - drop qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch (#447298),
   in favor of qt-copy's 0263-fix-fontconfig-handling.diff


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/F-9/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	13 Jan 2009 20:10:20 -0000	1.40
+++ sources	29 Jan 2009 19:49:39 -0000	1.41
@@ -1,4 +1,4 @@
 d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
 6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
 00e00c6324d342a7b0d8653112b4f08c  qt-x11-opensource-src-4.4.3.tar.bz2
-9c51cc569de37085da1af39750a35ba7  qt-copy-patches-20090112svn.tar.bz2
+9c2c9930560dddd4713aa99af3a5199f  qt-copy-patches-20090129svn.tar.bz2