scm-commits February 2007

scm-commits@lists.fedoraproject.org

1 participants
2547 discussions

rpms/qt4/devel qt-x11-opensource-src-4.2.2-extern_c.patch, NONE, 1.1 qt4.spec, 1.31, 1.32
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9641 Modified Files: qt4.spec Added Files: qt-x11-opensource-src-4.2.2-extern_c.patch Log Message: * Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-6 - patch around (hopefully) temporary Xrandr.h buglet qt-x11-opensource-src-4.2.2-extern_c.patch: --- NEW FILE qt-x11-opensource-src-4.2.2-extern_c.patch --- --- qt-x11-opensource-src-4.2.2/src/gui/kernel/qt_x11_p.h.extern_c 2006-11-27 11:26:12.000000000 -0600 +++ qt-x11-opensource-src-4.2.2/src/gui/kernel/qt_x11_p.h 2007-02-28 13:18:52.000000000 -0600 @@ -127,7 +127,9 @@ // #define QT_NO_XRANDR #ifndef QT_NO_XRANDR +extern "C" { # include <X11/extensions/Xrandr.h> +} #endif // QT_NO_XRANDR // #define QT_NO_XRENDER --- qt-x11-opensource-src-4.2.2/config.tests/x11/xrandr/xrandr.cpp.extern_c 2006-11-27 11:26:18.000000000 -0600 +++ qt-x11-opensource-src-4.2.2/config.tests/x11/xrandr/xrandr.cpp 2007-02-28 13:11:29.000000000 -0600 @@ -1,5 +1,7 @@ +extern "C" { #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> +} #if RANDR_MAJOR != 1 || RANDR_MINOR < 1 # error "Requried Xrandr version 1.1 not found." Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- qt4.spec 28 Feb 2007 17:28:01 -0000 1.31 +++ qt4.spec 28 Feb 2007 19:20:46 -0000 1.32 @@ -13,7 +13,7 @@ Summary: Qt toolkit Name: qt4 Version: 4.2.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -33,6 +33,8 @@ Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch # multilib hacks Patch2: qt-x11-opensource-src-4.2.2-multilib.patch +# hack to work around (hopefully) temporary Xrandr.h buglet +Patch3: qt-x11-opensource-src-4.2.2-extern_c.patch Source10: qt4-wrapper.sh Source11: qt4.sh @@ -215,6 +217,7 @@ %patch1 -p1 -b .assistant4 # don't use -b on mkspec files, else they get installed too. %patch2 -p1 +%patch3 -p1 -b .extern_c # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -539,6 +542,9 @@ %changelog +* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-6 +- patch around (hopefully) temporary Xrandr.h buglet + * Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-5 - fixup qconfig-multilib.h (#223663) - qt4.(sh|csh): define QMAKESPEC (#223663)

1 0

rpms/gnomesword/devel gnomesword.spec,1.25,1.26
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: deji Update of /cvs/extras/rpms/gnomesword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9451 Modified Files: gnomesword.spec Log Message: * Wed Feb 28 2007 Deji Akingunola <dakingun(a)gmail.com> - 2.2.2.1-3 - Rebuild for new gtkhtml Index: gnomesword.spec =================================================================== RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnomesword.spec 24 Feb 2007 21:02:12 -0000 1.25 +++ gnomesword.spec 28 Feb 2007 19:10:31 -0000 1.26 @@ -1,6 +1,6 @@ Name: gnomesword Version: 2.2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNOME-based Bible research tool Group: Applications/Text @@ -74,6 +74,9 @@ %_datadir/gnome/help/gnomesword/ %changelog +* Wed Feb 28 2007 Deji Akingunola <dakingun(a)gmail.com> - 2.2.2.1-3 +- Rebuild for new gtkhtml + * Sat Feb 24 2007 Deji Akingunola <dakingun(a)gmail.com> - 2.2.2.1-2 - Add libgnomeprintui22-devel as BR

1 0

rpms/libtelepathy/devel .cvsignore, 1.7, 1.8 libtelepathy.spec, 1.6, 1.7 sources, 1.7, 1.8
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: bpepple Update of /cvs/extras/rpms/libtelepathy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5341 Modified Files: .cvsignore libtelepathy.spec sources Log Message: * Wed Feb 28 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.0.51-1 - Update to 0.0.51. - Add BR on libxslt. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtelepathy/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Feb 2007 18:08:59 -0000 1.7 +++ .cvsignore 28 Feb 2007 18:20:17 -0000 1.8 @@ -1 +1 @@ -libtelepathy-0.0.42.tar.gz +libtelepathy-0.0.51.tar.gz Index: libtelepathy.spec =================================================================== RCS file: /cvs/extras/rpms/libtelepathy/devel/libtelepathy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libtelepathy.spec 20 Feb 2007 18:08:59 -0000 1.6 +++ libtelepathy.spec 28 Feb 2007 18:20:17 -0000 1.7 @@ -1,5 +1,5 @@ Name: libtelepathy -Version: 0.0.42 +Version: 0.0.51 Release: 1%{?dist} Summary: A GLib library to ease writing telepathy clients @@ -11,6 +11,7 @@ BuildRequires: dbus-devel BuildRequires: dbus-glib-devel +BuildRequires: libxslt %description @@ -70,6 +71,10 @@ %changelog +* Wed Feb 28 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.0.51-1 +- Update to 0.0.51. +- Add BR on libxslt. + * Tue Feb 20 2007 Brian Pepple <bpepple(a)fedoraproject.org> - 0.0.42-1 - Update to 0.0.42. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtelepathy/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Feb 2007 18:08:59 -0000 1.7 +++ sources 28 Feb 2007 18:20:17 -0000 1.8 @@ -1 +1 @@ -6c0781295b955d80c1e2d4027caa0230 libtelepathy-0.0.42.tar.gz +28a32062868f29b19f535476e422417b libtelepathy-0.0.51.tar.gz

1 0

rpms/gtkpod/FC-6 gtkpod-0.99.8_libgpod-0.4.2.diff, NONE, 1.1 gtkpod.desktop, NONE, 1.1 gtkpod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: tmz Update of /cvs/extras/rpms/gtkpod/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5161 Modified Files: .cvsignore sources Added Files: gtkpod-0.99.8_libgpod-0.4.2.diff gtkpod.desktop gtkpod.spec Log Message: setup FC-6 branch gtkpod-0.99.8_libgpod-0.4.2.diff: --- NEW FILE gtkpod-0.99.8_libgpod-0.4.2.diff --- diff -ru gtkpod-0.99.8/src/file.c gtkpod-0.99.8_libgpod-0.4.2/src/file.c --- gtkpod-0.99.8/src/file.c 2006-09-24 15:42:52.000000000 +0900 +++ gtkpod-0.99.8_libgpod-0.4.2/src/file.c 2007-01-16 01:06:52.000000000 +0900 @@ -851,7 +851,7 @@ to->time_modified = from->time_modified; to->year = from->year; to->compilation = from->compilation; - to->unk208 = from->unk208; + to->mediatype = from->mediatype; to->lyrics_flag = from->lyrics_flag; to->movie_flag = from->movie_flag; } @@ -1069,25 +1069,25 @@ { case FILE_TYPE_MP3: nti = mp3_get_file_info (name); - /* Set unk208 to audio */ - if (nti) nti->unk208 = 0x00000001; + /* Set mediatype to audio */ + if (nti) nti->mediatype = 0x00000001; break; case FILE_TYPE_M4A: case FILE_TYPE_M4P: case FILE_TYPE_M4B: nti = mp4_get_file_info (name); - /* Set unk208 to audio */ + /* Set mediatype to audio */ if (nti) { - nti->unk208 = 0x00000001; + nti->mediatype = 0x00000001; } break; case FILE_TYPE_WAV: nti = wav_get_file_info (name); - /* Set unk208 to audio */ + /* Set mediatype to audio */ if (nti) { - nti->unk208 = 0x00000001; + nti->mediatype = 0x00000001; } break; case FILE_TYPE_M4V: @@ -1096,10 +1096,10 @@ this. Let's see if someone complains. */ nti = mp4_get_file_info (name); if (!nti) video_get_file_info (name); - /* Set unk208 to video */ + /* Set mediatype to video */ if (nti) { - nti->unk208 = 0x00000002; + nti->mediatype = 0x00000002; nti->movie_flag = 0x01; } break; @@ -1107,10 +1107,10 @@ case FILE_TYPE_MPG: /* for now treat all the same */ nti = video_get_file_info (name); - /* Set unk208 to video */ + /* Set mediatype to video */ if (nti) { - nti->unk208 = 0x00000002; + nti->mediatype = 0x00000002; nti->movie_flag = 0x01; } break; diff -ru gtkpod-0.99.8/src/file_itunesdb.c gtkpod-0.99.8_libgpod-0.4.2/src/file_itunesdb.c --- gtkpod-0.99.8/src/file_itunesdb.c 2006-06-26 01:08:22.000000000 +0900 +++ gtkpod-0.99.8_libgpod-0.4.2/src/file_itunesdb.c 2007-01-16 01:06:52.000000000 +0900 @@ -589,9 +589,9 @@ track->has_artwork = 0x02; } - /* set unk208 to audio if unset (important only for iPod Video) */ - if (track->unk208 == 0) - track->unk208 = 0x00000001; + /* set mediatype to audio if unset (important only for iPod Video) */ + if (track->mediatype == 0) + track->mediatype = 0x00000001; /* restore deleted thumbnails */ if ((track->artwork->thumbnails == NULL) && (strlen (etr->thumb_path_locale) != 0)) --- NEW FILE gtkpod.desktop --- [Desktop Entry] Name=GtkPod GenericName=iPod Song Manager Comment=Manage songs on an Apple iPod Exec=gtkpod Icon=gtkpod.png Type=Application Categories=AudioVideo; Encoding=UTF-8 --- NEW FILE gtkpod.spec --- Name: gtkpod Version: 0.99.8 Release: 3%{?dist} Summary: Graphical song management program for Apple's iPod Group: Applications/Multimedia License: GPL URL: http://www.gtkpod.org Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}_libgpod-0.4.2.d… BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: flex BuildRequires: gettext BuildRequires: libglade2-devel BuildRequires: libgpod-devel >= 0.4.2 BuildRequires: libid3tag-devel BuildRequires: libmp4v2-devel %description gtkpod is a platform independent Graphical User Interface for Apple's iPod using GTK2. It supports the first to fifth Generation including the iPod mini, iPod Photo, iPod Shuffle, iPod nano, and iPod Video. %prep %setup -q # patch from upstream to build against libgpod-0.4.2 %patch -p1 -b .libgpod-0.4.2 cp -p %{SOURCE1} %{name}.desktop %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL="install -p" # install symlink to menu icon mkdir -p %{buildroot}%{_datadir}/pixmaps ln -s ../%{name}/pixmaps/%{name}-icon-48.png \ %{buildroot}%{_datadir}/pixmaps/%{name}.png # install menu entry mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install \ --vendor fedora \ --mode 0644 \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop %find_lang %{name} %clean rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog* COPYING README TODOandBUGS.txt TROUBLESHOOTING %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/*.desktop %changelog * Fri Feb 16 2007 Todd Zullinger <tmz(a)pobox.com> - 0.99.8-3 - preserve timestamps when copying .desktop file to builddir and running make install - use a symlink for the menu icon * Mon Feb 12 2007 Todd Zullinger <tmz(a)pobox.com> - 0.99.8-2 - remove redundant gtk2-devel BR - move .desktop creation to a separate file - remove livna stuff from .desktop file - don't use macros for install and mkdir - remove NEWS file from %%doc as it mostly mirrors the ChangeLog * Mon Feb 12 2007 Todd Zullinger <tmz(a)pobox.com> - 0.99.8-1 - initial fedora package, parts stolen from Matthias' FreshRPMS spec Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkpod/FC-6/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Feb 2007 18:51:41 -0000 1.1 +++ .cvsignore 28 Feb 2007 18:11:04 -0000 1.2 @@ -0,0 +1 @@ +gtkpod-0.99.8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkpod/FC-6/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Feb 2007 18:51:41 -0000 1.1 +++ sources 28 Feb 2007 18:11:04 -0000 1.2 @@ -0,0 +1 @@ +f04b67605204d9076d30d83b72b78463 gtkpod-0.99.8.tar.gz

1 0

rpms/crossvc/devel crossvc.spec,1.2,1.3
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: s4504kr Update of /cvs/extras/rpms/crossvc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1468 Modified Files: crossvc.spec Log Message: Rebuild becouse build error Index: crossvc.spec =================================================================== RCS file: /cvs/extras/rpms/crossvc/devel/crossvc.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- crossvc.spec 26 Feb 2007 20:20:02 -0000 1.2 +++ crossvc.spec 28 Feb 2007 18:00:52 -0000 1.3 @@ -1,6 +1,6 @@ Name: crossvc Version: 1.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical CVS Client @@ -81,7 +81,10 @@ %changelog -* Mon Feb 26 2007 Jochen Schmitt <s4504kr(a)zeus.herr-schmitt.de> 1.5.1-1 +* Wed Feb 28 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-2 +- Rebuild becouse build error + +* Mon Feb 26 2007 Jochen Schmitt <Jochen herr-schmitt de> 1.5.1-1 - New upstream release * Wed Oct 11 2006 Jochen Schmitt <Jochen herr-schmitt de> 1.5.0-4

1 0

rpms/john/FC-6 john.spec,1.12,1.13
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: till Update of /cvs/extras/rpms/john/FC-6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1387 Modified Files: john.spec Log Message: +- fixing wrong characters in specfile +- https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=148873&action=view Index: john.spec =================================================================== RCS file: /cvs/extras/rpms/john/FC-6/john.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- john.spec 10 Jan 2007 23:04:32 -0000 1.12 +++ john.spec 28 Feb 2007 17:56:49 -0000 1.13 @@ -1,7 +1,7 @@ Summary: John the Ripper password cracker Name: john Version: 1.7.0.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.openwall.com/john License: GPL @@ -27,7 +27,6 @@ %build %define target_non_mmx generic -%define target_mmx "%{nil}" %ifarch %{ix86} %define target_non_mmx linux-x86-any @@ -44,7 +43,7 @@ make -C src %{target_non_mmx} CFLAGS="${CFLAGS}" LDFLAGS="" -%if "%{target_mmx}" != "%{nil}" +%if 0%{?target_mmx:1} mv run/john run/john-non-mmx CFLAGS="${CFLAGS} -DCPU_FALLBACK=1" @@ -61,7 +60,7 @@ install -m 755 run/{john,mailer} %{buildroot}%{_bindir} install -m 644 run/{*.chr,password.lst} %{buildroot}%{_datadir}/john install -m 644 run/john.conf %{buildroot}%{_sysconfdir} -%if "⅜{target_mmx}" != "%{nil}" +%if 0%{?target_mmx:1} install -d 755 %{buildroot}%{_libexecdir}/john install -m 755 run/john-non-mmx %{buildroot}%{_libexecdir}/john/ %endif @@ -80,11 +79,15 @@ %config(noreplace) %{_sysconfdir}/john.conf %{_bindir}/* %{_datadir}/john -%if "⅜{target_mmx}" != "%{nil}" +%if 0%{?target_mmx:1} %{_libexecdir}/john/ %endif %changelog +* Tue Feb 27 2007 Till Maas <opensource till name> - 1.7.0.2-3 +- fixing wrong characters in specfile +- https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=148873&action=view + * Wed Jan 10 2007 Till Maas <opensource till name> - 1.7.0.2-2 - no mmx version for x86_64 since it is 32bit and does not build

1 0

rpms/jd/devel .cvsignore, 1.80, 1.81 jd.spec, 1.91, 1.92 sources, 1.80, 1.81
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: mtasaka Update of /cvs/extras/rpms/jd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1205 Modified Files: .cvsignore jd.spec sources Log Message: * Wed Feb 28 2007 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.cvs070228.1 - cvs 070228 (26:25 JST) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jd/devel/.cvsignore,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- .cvsignore 28 Feb 2007 16:57:13 -0000 1.80 +++ .cvsignore 28 Feb 2007 17:48:02 -0000 1.81 @@ -1 +1 @@ -jd-1.8.8-cvs070228.tgz +jd-1.8.8-cvs070228.1.tgz Index: jd.spec =================================================================== RCS file: /cvs/extras/rpms/jd/devel/jd.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- jd.spec 28 Feb 2007 16:57:13 -0000 1.91 +++ jd.spec 28 Feb 2007 17:48:02 -0000 1.92 @@ -10,7 +10,7 @@ # Defined by upsteam # %define main_ver 1.8.8 -%define strtag cvs070228 +%define strtag cvs070228.1 %define repoid 24034 @@ -106,8 +106,8 @@ %{icondir}/%{name}.png %changelog -* Wed Feb 28 2007 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.cvs070228 -- cvs 070228 (24:10 JST) +* Wed Feb 28 2007 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.cvs070228.1 +- cvs 070228 (26:25 JST) * Sun Feb 18 2007 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 1.8.8-0.1.beta070218 - 1.8.8 beta070218 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jd/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 28 Feb 2007 16:57:13 -0000 1.80 +++ sources 28 Feb 2007 17:48:02 -0000 1.81 @@ -1 +1 @@ -26c4737179d03c7fcb725a25ec32798f jd-1.8.8-cvs070228.tgz +cecf643cc1a6eefc7fc607843cbe740f jd-1.8.8-cvs070228.1.tgz

1 0

rpms/qt4/devel qconfig-multilib.h, NONE, 1.1 qt4.csh, NONE, 1.1 qt4.sh, NONE, 1.1 qt4.spec, 1.30, 1.31 qconfig.h, 1.1, NONE
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: rdieter Update of /cvs/extras/rpms/qt4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv763 Modified Files: qt4.spec Added Files: qconfig-multilib.h qt4.csh qt4.sh Removed Files: qconfig.h Log Message: * Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-5 - fixup qconfig-multilib.h (#223663) - qt4.(sh|csh): define QMAKESPEC (#223663) - null'ify QMAKE_LIBDIR_QT, leave QMAKE_INCDIR_QT alone for now. (#230224) --- NEW FILE qconfig-multilib.h --- /* qconfig.h */ /* hack for multilib'ing */ #if defined(__x86_64__) # include <QtCore/qconfig-x86_64.h> #elif defined(__i386__) # include <QtCore/qconfig-i386.h> #elif defined(__ppc64__) # include <QtCore/qconfig-ppc64.h> #elif defined(__ppc__) # include <QtCore/qconfig-ppc.h> #elif defined(__sparc__) # include <QtCore/qconfig-sparc.h> #else # error arch unsupported, see http://bugzilla.redhat.com/223663 #endif --- NEW FILE qt4.csh --- # Qt4 initialization script (csh) if ( $?QMAKESPEC ) then exit endif setenv QMAKESPEC @@QMAKESPEC@@ --- NEW FILE qt4.sh --- # Qt4 initialization script (sh) if [ -z "$QMAKESPEC" ] ; then QMAKESPEC=@@QMAKESPEC@@ export QMAKESPEC fi Index: qt4.spec =================================================================== RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- qt4.spec 27 Feb 2007 19:13:39 -0000 1.30 +++ qt4.spec 28 Feb 2007 17:28:01 -0000 1.31 @@ -13,7 +13,7 @@ Summary: Qt toolkit Name: qt4 Version: 4.2.2 -Release: 3%{?dist} +Release: 5%{?dist} License: GPL/QPL Group: System Environment/Libraries @@ -27,14 +27,16 @@ # See http://bugzilla.redhat.com/223663 ExclusiveArch: %{ix86} x86_64 ppc -Source5: qconfig.h +Source5: qconfig-multilib.h # search for assistant-qt4 instead of (qt3's) assistant in $PATH Patch1: qt-x11-opensource-src-4.1.2-assistant4.patch -# look in PrefixPath/mkspecs too +# multilib hacks Patch2: qt-x11-opensource-src-4.2.2-multilib.patch Source10: qt4-wrapper.sh +Source11: qt4.sh +Source12: qt4.csh Source20: assistant.desktop Source21: designer.desktop @@ -124,8 +126,6 @@ #BuildRequires: sqlite-devel %endif -#BuildConflicts: qt4-devel - Obsoletes: %{name}-config < %{version}-%{release} Provides: %{name}-config = %{version}-%{release} @@ -214,7 +214,7 @@ %patch1 -p1 -b .assistant4 # don't use -b on mkspec files, else they get installed too. -%patch2 -p1 +%patch2 -p1 # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -225,18 +225,22 @@ %else %define platform linux-g++ %endif -#grep -- '-O2' mkspecs/common/g++.conf | sed -e "s|-O2|$RPM_OPT_FLAGS|g" >> mkspecs/common/g++-optflags.conf -sed -i -e "s|-O2|$RPM_OPT_FLAGS|g" mkspecs/%{platform}/qmake.conf -## FIXME(?) +sed -i \ + -e "s|-O2|$RPM_OPT_FLAGS|g" \ + -e "s|g++.conf|g++-multilib.conf|g" mkspecs/%{platform}/qmake.conf +sed -e "s|^QMAKE_CFLAGS_RELEASE|#QMAKE_CFLAGS_RELEASE|g" \ + mkspecs/common/g++.conf > mkspecs/common/g++-multilib.conf + +## FIXME, http://bugzilla.redhat.com/230224 # On the surface, looks like a good idea to strip -I/usr/include, -L/usr/lib, # but it turns out qmake-consuming apps expect/use INCDIR/LIBDIR directly # (e.g. PyQt4, texmaker), and don't cope with null values #if "%{qt_headerdir}" == "%{_includedir}" #sed -i -e "s|^QMAKE_INCDIR_QT.*=.*|QMAKE_INCDIR_QT =|" mkspecs/common/linux.conf #endif -#if "%{qt_libdir}" == "%{_libdir}" -#sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT =|" mkspecs/common/linux.conf -#endif +%if "%{qt_libdir}" == "%{_libdir}" +sed -i -e "s|^QMAKE_LIBDIR_QT.*=.*|QMAKE_LIBDIR_QT =|" mkspecs/common/linux.conf +%endif # undefine QMAKE_STRIP, so we get useful -debuginfo pkgs sed -i -e "s|^QMAKE_STRIP.*=.*|QMAKE_STRIP =|" mkspecs/common/linux.conf @@ -304,6 +308,11 @@ make install INSTALL_ROOT=%{buildroot} +## qt4.(sh|csh) +install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4.sh +install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4.csh +sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/qt4.* + # Add desktop file(s) desktop-file-install \ --dir %{buildroot}%{_datadir}/applications \ @@ -325,6 +334,7 @@ sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.pc sed -i -e "s|$dep ||g" %{buildroot}%{qt_libdir}/*.prl done +# nuke dandling reference(s) to %buildroot sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" %{buildroot}%{qt_libdir}/*.prl mkdir -p %{buildroot}%{_libdir}/pkgconfig/ @@ -368,10 +378,10 @@ rm -f %{buildroot}%{qt_libdir}/lib*.la ## multilib: qconfig -mv %{buildroot}%{qt_headerdir}/Qt/qconfig.h %{buildroot}%{qt_headerdir}/Qt/qconfig-%{_arch}.h -install -p -m644 -D %{SOURCE5} %{buildroot}%{qt_headerdir}/Qt/qconfig.h -mv %{buildroot}%{qt_headerdir}/QtCore/qconfig.h %{buildroot}%{qt_headerdir}/QtCore/qconfig-%{_arch}.h -install -p -m644 -D %{SOURCE5} %{buildroot}%{qt_headerdir}/QtCore/qconfig.h +mv %{buildroot}%{qt_headerdir}/Qt/qconfig.h %{buildroot}%{qt_headerdir}/QtCore/qconfig-%{_arch}.h +install -p -m644 -D %{SOURCE5} %{buildroot}%{qt_headerdir}/QtCore/qconfig-multilib.h +ln -sf qconfig-multilib.h %{buildroot}%{qt_headerdir}/QtCore/qconfig.h +ln -sf ../QtCore/qconfig.h %{buildroot}%{qt_headerdir}/Qt/qconfig.h ## mkspecs/default rm -f %{buildroot}%{qt_datadir}/mkspecs/default mkdir %{buildroot}%{qtdir}/mkspecs @@ -442,13 +452,10 @@ %files devel %defattr(-,root,root,-) +%config /etc/profile.d/* %{qtdir}/bin/lrelease* %{qtdir}/bin/lupdate* %{qtdir}/bin/moc* -%if "%{version}" < "4.2.0" -%{qtdir}/bin/qm2ts* -%{_bindir}/qm2ts* -%endif %if "%{?qdbus}" == "-qdbus" %{qtdir}/bin/qdbus* %{_bindir}/qdbus* @@ -532,6 +539,11 @@ %changelog +* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-5 +- fixup qconfig-multilib.h (#223663) +- qt4.(sh|csh): define QMAKESPEC (#223663) +- null'ify QMAKE_LIBDIR_QT, leave QMAKE_INCDIR_QT alone for now. (#230224) + * Tue Feb 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.2.2-3 - drop ./configure -no-reduce-exports (ie, support visibility) - multilib issues (#223663) --- qconfig.h DELETED ---

1 0

rpms/gutenprint/devel gutenprint.spec,1.13,1.14
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: twaugh Update of /cvs/extras/rpms/gutenprint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv719 Modified Files: gutenprint.spec Log Message: * Wed Feb 28 2007 Tim Waugh <twaugh(a)redhat.com> - Fixed typo in patch line. Index: gutenprint.spec =================================================================== RCS file: /cvs/extras/rpms/gutenprint/devel/gutenprint.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gutenprint.spec 28 Feb 2007 17:23:19 -0000 1.13 +++ gutenprint.spec 28 Feb 2007 17:27:24 -0000 1.14 @@ -232,7 +232,7 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -z .menu +%patch0 -p1 -b .menu %build %configure --disable-static --disable-dependency-tracking \ @@ -402,6 +402,9 @@ /bin/rm -f /var/cache/foomatic/* %changelog +* Wed Feb 28 2007 Tim Waugh <twaugh(a)redhat.com> +- Fixed typo in patch line. + * Wed Feb 28 2007 Tim Waugh <twaugh(a)redhat.com> 5.0.0-6 - Ported menu patch from gimp-print package. - Fixed summary for plugin sub-package.

1 0

rpms/gutenprint/devel gutenprint.spec,1.12,1.13
by fedora-extras-commits＠redhat.com 28 Feb '07

28 Feb '07

Author: twaugh Update of /cvs/extras/rpms/gutenprint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv621 Modified Files: gutenprint.spec Log Message: 5.0.0-6 Index: gutenprint.spec =================================================================== RCS file: /cvs/extras/rpms/gutenprint/devel/gutenprint.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gutenprint.spec 28 Feb 2007 17:22:27 -0000 1.12 +++ gutenprint.spec 28 Feb 2007 17:23:19 -0000 1.13 @@ -4,7 +4,7 @@ Name: gutenprint Summary: Printer Drivers Package Version: 5.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Group: System Environment/Base URL: http://gimp-print.sourceforge.net/ Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2 @@ -402,7 +402,7 @@ /bin/rm -f /var/cache/foomatic/* %changelog -* Wed Feb 28 2007 Tim Waugh <twaugh(a)redhat.com> +* Wed Feb 28 2007 Tim Waugh <twaugh(a)redhat.com> 5.0.0-6 - Ported menu patch from gimp-print package. - Fixed summary for plugin sub-package.

1 0

← Newer
1
2
3
4
5
6
7
8
...
255
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits February 2007