rpms/qt4/devel assistant.desktop, NONE, 1.1 designer.desktop, NONE, 1.1 linguist.desktop, NONE, 1.1 qt-x11-opensource-src-4.1.2-assistant4.patch, NONE, 1.1 qt4-wrapper.sh, NONE, 1.1 qt4.spec, NONE, 1.1 qtconfig.desktop, NONE, 1.1 qtdemo.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed May 24 14:06:14 UTC 2006
- Previous message (by thread): rpms/lyx/FC-4 lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 .cvsignore, 1.5, 1.6 lyx.spec, 1.22, 1.23 lyx-1.4.0-boost.patch, 1.1, NONE
- Next message (by thread): owners owners.list,1.1052,1.1053
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/devel
Modified Files:
.cvsignore sources
Added Files:
assistant.desktop designer.desktop linguist.desktop
qt-x11-opensource-src-4.1.2-assistant4.patch qt4-wrapper.sh
qt4.spec qtconfig.desktop qtdemo.desktop
Log Message:
auto-import qt4-4.1.3-3 on branch devel from qt4-4.1.3-3.src.rpm
--- NEW FILE assistant.desktop ---
[Desktop Entry]
Name=Qt4 Assistant
Comment=Add translations to Qt4 applications
Exec=assistant4
Icon=assistant
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;
--- NEW FILE designer.desktop ---
[Desktop Entry]
Name=Qt4 Designer
GenericName=Interface Designer
Comment=Design GUIs for Qt4 applications
Exec=designer4
Icon=designer
MimeType=application/x-designer;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;
--- NEW FILE linguist.desktop ---
[Desktop Entry]
Name=Qt4 Linguist
Comment=Add translations to Qt4 applications
Exec=linguist4
Icon=linguist
MimeType=application/x-linguist;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;
qt-x11-opensource-src-4.1.2-assistant4.patch:
--- NEW FILE qt-x11-opensource-src-4.1.2-assistant4.patch ---
--- qt-x11-opensource-src-4.1.2/tools/assistant/lib/qassistantclient.cpp.assistant4 2006-03-20 07:04:38.000000000 -0600
+++ qt-x11-opensource-src-4.1.2/tools/assistant/lib/qassistantclient.cpp 2006-05-15 10:41:41.000000000 -0500
@@ -166,7 +166,7 @@
: QObject( parent ), host ( "localhost" )
{
if ( path.isEmpty() )
- assistantCommand = "assistant";
+ assistantCommand = "assistant4";
else {
QFileInfo fi( path );
if ( fi.isDir() )
--- NEW FILE qt4-wrapper.sh ---
#!/bin/sh
if [ -z "$QT4DIR" ] ; then
QT4DIR="`/usr/bin/pkg-config --variable=prefix QtCore`"
if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then
PATH=${QT4DIR}/bin:${PATH}
fi
export QT4DIR PATH
fi
exec $QT4DIR/bin/`basename $0` ${1+"$@"}
--- NEW FILE qt4.spec ---
# Currently under review for Fedora Extras at
# http://bugzilla.redhat.com/bugzilla/188180
Summary: Qt GUI toolkit
Name: qt4
Version: 4.1.3
Release: 3%{?dist}
License: GPL/QPL
Group: System Environment/Libraries
Url: http://www.trolltech.com/products/qt/
Source0: ftp://ftp.troll.no/qt/source/qt-x11-opensource-src-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# search for assistant4 instead of (qt3's) assistant in $PATH
Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch
Source10: qt4-wrapper.sh
Source20: assistant.desktop
Source21: designer.desktop
Source22: linguist.desktop
Source23: qtdemo.desktop
Source24: qtconfig.desktop
## Optional bits
# Build mysql plugins
%define mysql 1
# Build postgresql plugins
%define psql 1
# Build ODBC plugins
%define odbc 1
# Build sqlite plugins
%define sqlite 1
%define qt_dirname qt4
%define qtdir %{_libdir}/%{qt_dirname}
%define qt_docdir %{_docdir}/%{name}-doc-%{version}
Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d
Requires(postun): /sbin/ldconfig fileutils /etc/ld.so.conf.d
BuildRequires: desktop-file-utils
BuildRequires: libmng-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
BuildRequires: libungif-devel
BuildRequires: findutils
BuildRequires: cups-devel
BuildRequires: tar
BuildRequires: freetype-devel
BuildRequires: fontconfig-devel
%define x_deps xorg-x11-devel libGL-devel libGLU-devel
%if "%{?fedora}" > "4"
%define x_deps libICE-devel libSM-devel libXcursor-devel libXext-devel libXft-devel libXi-devel libXinerama-devel libXrandr-devel libXrender-devel libXt-devel libX11-devel xorg-x11-proto-devel libGL-devel libGLU-devel
%endif
BuildRequires: %{x_deps}
%if %{mysql}
# mysql-devel < 4 build fails, not sure why... yet. -- Rex
BuildRequires: mysql-devel >= 4.0
# If we get mysql3 to work, use mysql_config --cflags instead -- Rex
%global mysql_include $(mysql_config --include || echo "-I%{_includedir}/mysql")
%global mysql_libs $(mysql_config --libs || echo "-L%{_libdir}/mysql")
%global mysql_ldflags $(echo %{mysql_libs} | perl -pi -e "s, -l/?\\\S+,,g")
%endif
%if %{psql}
BuildRequires: postgresql-devel
%endif
%if %{odbc}
BuildRequires: unixODBC-devel
%endif
%if %{sqlite}
BuildRequires: sqlite-devel
%endif
%description
Qt is a GUI software toolkit which simplifies the task of writing and
maintaining GUI (Graphical User Interface) applications
for the X Window System.
%package config
Summary: Grapical configuration tool for programs using Qt
Group: User Interface/Desktops
Requires: %{name} = %{version}-%{release}
%description config
%{summary}.
%package devel
Summary: Development files for the Qt GUI toolkit
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{x_deps}
Requires: libpng-devel
Requires: libjpeg-devel
Requires: pkgconfig
Obsoletes: %{name}-designer < %{version}-%{release}
Provides: %{name}-designer = %{version}-%{release}
%description devel
This package contains the files necessary to develop
applications using the Qt GUI toolkit. Includes:
Qt Linguist
%package doc
Summary: API documentation, demos and example programs for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
Provides: %{name}-assistant = %{version}_%{release}
# For docs -> doc rename, temporary, since it was a short-lived subpkg
Obsoletes: %{name}-docs < %{version}-%{release}
Provides: %{name}-docs = %{version}-%{release}
%description doc
%{summary}. Includes:
Qt Assistant, Qt Demo
%package odbc
Summary: ODBC driver for Qt's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-ODBC < %{version}-%{release}
Provides: %{name}-ODBC = %{version}-%{release}
%description odbc
%{summary}.
%package mysql
Summary: MySQL driver for Qt's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-MySQL < %{version}-%{release}
Provides: %{name}-MySQL = %{version}-%{release}
%description mysql
%{summary}.
%package postgresql
Summary: PostgreSQL driver for Qt's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-PostgreSQL < %{version}-%{release}
Provides: %{name}-PostgreSQL = %{version}-%{release}
%description postgresql
%{summary}.
%package sqlite
Summary: SQLite driver for Qt's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: %{name}-SQLite < %{version}-%{release}
Provides: %{name}-SQLite = %{version}-%{release}
%description sqlite
%{summary}.
%prep
%setup -q -n qt-x11-opensource-src-%{version}
%patch1 -p1 -b .assistant4
%build
export QTDIR=`/bin/pwd`
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
# use $RPM_OPT_FLAGS for our platform
%if "%{_lib}" == "lib64"
%define platform linux-g++-64
%else
%define platform linux-g++
%endif
sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf
# set correct lib path
if [ "%{_lib}" == "lib64" ] ; then
sed -i -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test
sed -i -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
fi
# build shared, threaded (default) libraries
echo yes | ./configure -v \
-no-rpath \
-prefix %{qtdir} \
-libdir %{qtdir}/%{_lib} \
-docdir %{qt_docdir} \
-platform %{platform} \
-release \
-shared \
-no-exceptions \
-largefile \
-qt-gif \
-system-zlib \
-system-libpng \
-system-libjpeg \
%if %{mysql}
-plugin-sql-mysql \
%{?mysql_include} \
%{?mysql_ldflags} \
%endif
%if %{psql}
-plugin-sql-psql \
%endif
%if %{odbc}
-plugin-sql-odbc \
%endif
%if %{sqlite}
-plugin-sql-sqlite \
%endif
-cups \
-sm \
-stl \
-xcursor \
-xinerama \
-xshape \
-xrandr \
-xrender \
-xkb \
-fontconfig \
-tablet
make %{?_smp_mflags}
%install
rm -rf %{buildroot}
export QTDIR=`/bin/pwd`
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
make install INSTALL_ROOT=%{buildroot}
## pkg-config
# strip extraneous dirs/libraries -- Rex
# safe ones
for dep in -lmng -ljpeg -lpng -lz -lfreetype -lm %{?mysql_ldflags} -L%{_builddir}/qt-x11-opensource-src-%{version}/lib ; do
sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||:
sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc
sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl
done
# not-so-safe, but we can try -- Rex
for dep in -L/usr/X11R6/%{_lib} -lXrender -lXrandr -lXcursor -lXinerama -lXft -lfontconfig -lXext -lX11 -lSM -lICE -ldl -lpthread ; do
sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.la ||:
sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.pc
sed -i -e "s| $dep||g" %{buildroot}%{qtdir}/%{_lib}/*.prl
done
sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qtdir}/%{_lib}/*.prl
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
pushd %{buildroot}%{_libdir}/pkgconfig
for i in ../%{qt_dirname}/%{_lib}/*.pc ; do
[ -f "$i" ] && ln -s $i .
done
popd
# -doc make symbolic link to qt_docdir
rm -rf %{buildroot}%{qtdir}/doc
ln -s ../../share/doc/%{name}-doc-%{version} %{buildroot}%{qtdir}/doc
# put LICENSE.* files in %%qtdir, some apps' configure scripts expect to find them here
install -p -m644 LICENSE.* %{buildroot}%{qtdir}/
# Make symlinks in %%_bindir
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{qtdir}/bin
for i in *; do
case "$i" in
qt3to4|uic3|rcc)
LINK=$i
;;
qtconfig)
LINK=qt4config
;;
qtdemo)
LINK=qt4demo
;;
*)
LINK=${i}4
;;
esac
# ln -s ../%{_lib}/%{qt_dirname}/bin/$i %{buildroot}%{_bindir}/${LINK}
# or use qt4-wrapper.sh
[ "$i" != "$LINK" ] && ln -s $i %{buildroot}%{qtdir}/bin/${LINK}
install -p -D %{SOURCE10} %{buildroot}%{_bindir}/${LINK}
done
popd
# Add desktop file(s)
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
--vendor="%{name}" \
--add-category="X-Fedora" \
--remove-key=MapNotify \
%{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
# .la files, die, die, die.
rm -f %{buildroot}%{qtdir}/%{_lib}/lib*.la
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{qtdir}/%{_lib}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc README* changes* OPENSOURCE-NOTICE.TXT
%{qtdir}/LICENSE.*
/etc/ld.so.conf.d/*
%dir %{qtdir}
%dir %{qtdir}/%{_lib}/
%{qtdir}/%{_lib}/lib*.so.*
%dir %{qtdir}/plugins/
%{qtdir}/plugins/imageformats/
%{qtdir}/plugins/accessible/
%{qtdir}/plugins/inputmethods/
%{qtdir}/translations/
%files config
%defattr(-,root,root,-)
%dir %{qtdir}
%dir %{qtdir}/bin/
%{qtdir}/bin/qt*config*
%{_bindir}/qt*config*
%{_datadir}/applications/*qtconfig*.desktop
%files devel
%defattr(-,root,root,-)
%dir %{qtdir}
%dir %{qtdir}/bin/
%{qtdir}/bin/lrelease*
%{qtdir}/bin/lupdate*
%{qtdir}/bin/moc*
%{qtdir}/bin/qm2ts*
%{qtdir}/bin/qmake*
%{qtdir}/bin/qt3to4
%{qtdir}/bin/rcc*
%{qtdir}/bin/uic*
%{_bindir}/lrelease*
%{_bindir}/lupdate*
%{_bindir}/moc*
%{_bindir}/qm2ts*
%{_bindir}/qmake*
%{_bindir}/qt3to4
%{_bindir}/rcc*
%{_bindir}/uic*
%{qtdir}/include/
%{qtdir}/mkspecs/
%dir %{qtdir}/%{_lib}
%{qtdir}/%{_lib}/*.so
%{qtdir}/%{_lib}/*.a
%{qtdir}/%{_lib}/*.prl
%{qtdir}/phrasebooks/
%{qtdir}/%{_lib}/*.pc
%{_libdir}/pkgconfig/*.pc
%{qtdir}/q3porting.xml
# Qt designer
%{_bindir}/designer*
%{qtdir}/bin/designer*
%dir %{qtdir}/plugins
%{qtdir}/plugins/designer/
%{_datadir}/applications/*designer*.desktop
# Qt Linguist
%{qtdir}/bin/linguist*
%{_bindir}/linguist*
%{_datadir}/applications/*linguist*.desktop
%files doc
%defattr(-,root,root,-)
%dir %{qt_docdir}/
%{qt_docdir}/html
%dir %{qtdir}
%dir %{qtdir}/bin/
%{qtdir}/doc
%{qtdir}/demos/
%{qtdir}/examples/
# Qt Assistant
%{qtdir}/bin/assistant*
%{_bindir}/assistant*
%{_datadir}/applications/*assistant*.desktop
# Qt Demo
%{qtdir}/bin/qt*demo*
%{_bindir}/qt*demo*
%{_datadir}/applications/*qtdemo*.desktop
%if %{odbc}
%files odbc
%defattr(-,root,root,-)
%dir %{qtdir}
%dir %{qtdir}/plugins
%dir %{qtdir}/plugins/sqldrivers
%{qtdir}/plugins/sqldrivers/libqsqlodbc*
%endif
%if %{psql}
%files postgresql
%defattr(-,root,root,-)
%dir %{qtdir}
%dir %{qtdir}/plugins
%dir %{qtdir}/plugins/sqldrivers
%{qtdir}/plugins/sqldrivers/libqsqlpsql*
%endif
%if %{mysql}
%files mysql
%defattr(-,root,root,-)
%dir %{qtdir}
%dir %{qtdir}/plugins
%dir %{qtdir}/plugins/sqldrivers
%{qtdir}/plugins/sqldrivers/libqsqlmysql*
%endif
%if %{sqlite}
%files sqlite
%defattr(-,root,root,-)
%dir %{qtdir}
%dir %{qtdir}/plugins
%dir %{qtdir}/plugins/sqldrivers
%{qtdir}/plugins/sqldrivers/libqsqlite*
%endif
%changelog
* Sun May 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-3
- fix %%mysql_libs macro
* Sat May 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-2
- -mysql: use mysql_config for setting cflags/ldflags.
- -mysql: BR: mysql-devel > 4.0
* Sat May 20 2006 Laurent Rineau <laurent.rineau__fc_extra at normalesup.org>
- Fix the last reference to %{qtdir}/lib: use %{_lib} instead of "lib".
- Fix the ownership of subpackages: they need to own parents of directories they install files in.
* Fri May 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-1
- 4.1.3
- %%qtdir/lib/*.pc -> %%qtdir/%%_lib/*.pc
(hopefully, the last hardcoded reference to %%qtdir/lib)
* Fri May 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-20
- fix some unowned dirs
- try harder to purge %%builddir from .pc,.prl files
- -docdir %%_docdir/%%name-doc-%%version, since we use %%doc macro in main pkg
- -doc: own %%qt_docdir
- use qt4-wrapper.sh to ensure launch of qt4 versions of apps that
(may) overlap with those from qt3
- use %%qtdir/%%_lib in ld.so.conf.d/*.conf files too
* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-19
- drop libQtAssistantClient,libQtUiTools shlib patches
* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-18
- %%_bindir symlinks: qtconfig4 -> qt4config, qtdemo4 -> qt4demo
- -libdir %%qtdir/%%_lib, simplifies %%_lib != lib case
- -docdir %%_docdir/%%name-%%version
- build shared versions of libQtAssistantClient,libQtUiTools too
- strip extraneous -L paths, libs from *.prl files too
* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-17
- .desktop: Qt -> Qt4, and Comment= (where missing)
- -devel: include -designer here, Obsoletes/Provides: %%name-designer.
It's small, simplifies things... one less subpkg to worry about.
- -doc: include %%qtdir/doc symlink here
- -docdir %%_docdir/%%name-doc-%%version
* Mon May 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-16
- set/use RPM_OPT_FLAGS only for our platform
- (really) don't give %%_bindir symlink for qt3to4 another "4" suffix
- don't add 4 suffix to uic3, rcc (they don't conflict with qt(3)-devel)
- -devel: add linguist.desktop
- -doc: move assistant here, Provides: %%{name}-assistant, add assistant.desktop
- -doc: add qtdemo.desktop
- -doc: Requires qt4 (instead of qt4-devel)
- assistant4.patch: search for assistant4 instead of (qt3's) assistant in $PATH
- -qtconfig: add qtconfig.desktop
- updated %%sumaries to mention where (some) tools are, including assistant, linguist,
qtdemo
* Mon May 15 2006 Laurent Rineau <laurent.rineau__fc_extra at normalesup.org> - 4.1.2-15
- Rename -docs to -doc.
- Files in the -doc subpackage are no longer in %%doc.
- Move qtdemo to the subpackage -doc.
- Fix symlinks in %%{_bindir}.
- Only modify mkspecs/linux-g++*/qmake.conf, instead of all mkspecs/*/qmake.conf.
* Sun May 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-14
- remove MapNotify from .desktop file(s).
- install -m644 LICENSE.*
- -docs: don't mark examples as %doc
- drop unused %%debug macro
* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-13
- include unpackaged pkgconfig files
* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-12
- fix typos so it actually builds.
* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-11
- drop optional ld.so.conf.d usage, make mandatory
- make %%_bindir symlinks to all %%qtdir/bin stuff (even qt3to4)
- pkgconfig files: hardlinks -> relative symlinks, strip -L%{_libdir}/mysql
and -L%%{_builddir}/qt-x11-opensource-src-%%version/lib
- cleanup/simplify Summary/%%description entries
- $RPM_BUILD_ROOT -> %%buildroot, $RPM_BUILD_DIR -> %%_builddir
* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-10
- cleanup/simplify license bits, include LICENSE.QPL
- drop unused -styles/-Xt subpkg reference
- drop unused motif extention bits
- drop initialpreference from .deskstop files
* Fri May 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-9
- drop reference to non-existent config.test/unix/checkavail
* Fri May 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-8
- simplify build* macros
- lower-case all subpkgs (ie, -MySQL -> -mysql )
- drop BR: perl, sed
* Thu May 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-7
- rework %%post/%%postun, mostly to placate rpmlint
- drop Prefix:
- drop use of qt4.(sh|csh), they're empty atm anyway
- use Source'd designer.desktop (instead of inline cat/echo)
- symlinks to %%_bindir: qmake4, designer4, qtconfig4
- drop qtrc, qt4 doesn't use it.
- -docs subpkg for API html docs, demos, examples.
- BR: libXcursor-devel libXi-devel (fc5+)
* Thu Apr 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-6
- devel: Requires: pkgconfig
* Sat Apr 15 2006 Simon Perreault <nomis80 at nomis80.org> 4.1.2-5
- Disable C++ exceptions.
* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-4
- qt4.(sh|csh): place-holders only, don't define QTDIR (and QTLIB)
as that (potentially) conflicts with qt-3.x.
* Thu Apr 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-2
- -devel: Drop (artificial) Conflicts: qt-devel
- fix %%ld_so_conf_d usage
- %%qtdir/%%_lib symlink
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-1
- drop Epoch
- cleanup (a lot!)
* Tue Dec 20 2005 Than Ngo <than at redhat.com> 1:4.1.0-0.1
- update to 4.1.0
* Fri Sep 09 2005 Than Ngo <than at redhat.com> 1:4.0.1-0.1
- update to 4.0.1
--- NEW FILE qtconfig.desktop ---
[Desktop Entry]
Name=Qt4 Config
Comment=Configure Qt4 behavior, styles, fonts
Exec=qt4config
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;
--- NEW FILE qtdemo.desktop ---
[Desktop Entry]
Name=Qt4 Demo
Comment=Show Qt4 demos and programming examples
Exec=qt4demo
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Application;Development;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 May 2006 14:04:36 -0000 1.1
+++ .cvsignore 24 May 2006 14:06:14 -0000 1.2
@@ -0,0 +1 @@
+qt-x11-opensource-src-4.1.3.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 May 2006 14:04:36 -0000 1.1
+++ sources 24 May 2006 14:06:14 -0000 1.2
@@ -0,0 +1 @@
+c6fc6934bfca458dde6e6370a2ed0101 qt-x11-opensource-src-4.1.3.tar.gz
- Previous message (by thread): rpms/lyx/FC-4 lyx-1.4.1-defaults.patch, NONE, 1.1 lyxrc.defaults.custom, NONE, 1.1 .cvsignore, 1.5, 1.6 lyx.spec, 1.22, 1.23 lyx-1.4.0-boost.patch, 1.1, NONE
- Next message (by thread): owners owners.list,1.1052,1.1053
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list