rpms/xorg-x11-apps/devel xvidtune-1.0.1-buffer-stomp.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xorg-x11-apps.spec, 1.34, 1.35
Adam Jackson
ajax at fedoraproject.org
Thu Jul 2 20:44:58 UTC 2009
- Previous message (by thread): rpms/eclipse-valgrind/F-11 eclipse-valgrind-massif-unknown-symbols.patch, NONE, 1.1 eclipse-valgrind.spec, 1.9, 1.10
- Next message (by thread): rpms/lvm2/F-11 lvm2-2_02_48-cluster-cpg-new-api-reverse.patch, NONE, 1.1 .cvsignore, 1.65, 1.66 lvm2.spec, 1.157, 1.158 sources, 1.69, 1.70 upstream, 1.58, 1.59 LVM2.2.02.45.tgz.asc, 1.1, NONE lvm2-2_02_46-add-mmc-filter.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-apps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19291
Modified Files:
.cvsignore sources xorg-x11-apps.spec
Added Files:
xvidtune-1.0.1-buffer-stomp.patch
Log Message:
* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-1
- Add xfd, xfontsel, and xvidtune
xvidtune-1.0.1-buffer-stomp.patch:
--- NEW FILE xvidtune-1.0.1-buffer-stomp.patch ---
--- xorg-x11-apps-7.4/xvidtune-1.0.1/xvidtune.c.jx 2004-04-23 15:55:08.000000000 -0400
+++ xorg-x11-apps-7.4/xvidtune-1.0.1/xvidtune.c 2006-08-04 17:16:17.000000000 -0400
@@ -965,7 +965,7 @@
wids[0] = XtCreateWidget (w1name, labelWidgetClass, form, NULL, 0);
if (findex >= PixelClock && findex <= VSyncRate)
- (void) sprintf(buf, "%6.2f", (float)AppRes.field[findex].val / 1000.0);
+ (void) snprintf(buf, 10, "%6.2f", (float)AppRes.field[findex].val / 1000.0);
else
(void) sprintf (buf, "%5d", AppRes.field[findex].val);
wids[1] = XtVaCreateWidget (w2name, labelWidgetClass,
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore 22 Jun 2009 00:48:31 -0000 1.14
+++ .cvsignore 2 Jul 2009 20:44:58 -0000 1.15
@@ -16,3 +16,6 @@ xwud-1.0.1.tar.bz2
xconsole-1.0.3.tar.bz2
xmessage-1.0.2.tar.bz2
xinput-1.4.99.1.tar.bz2
+xfd-1.0.1.tar.bz2
+xfontsel-1.0.2.tar.bz2
+xvidtune-1.0.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources 22 Jun 2009 00:48:32 -0000 1.14
+++ sources 2 Jul 2009 20:44:58 -0000 1.15
@@ -16,3 +16,6 @@ b41ed6b4bcfc9897366c27a94d2bf150 xload-
0e1a3110bebabecc2897d67a973526b0 xconsole-1.0.3.tar.bz2
b4b561ef11fd184989a6062962e86748 xmessage-1.0.2.tar.bz2
4b255aafae9ddd59e10292f8bac5504e xinput-1.4.99.1.tar.bz2
+c72abd90f50ef459bc14b39ec9fcc7f8 xfd-1.0.1.tar.bz2
+288fe4cf8a990e4e602aac16dd9109fb xfontsel-1.0.2.tar.bz2
+e0744594f4e5969b20df28d897781318 xvidtune-1.0.1.tar.bz2
Index: xorg-x11-apps.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- xorg-x11-apps.spec 22 Jun 2009 00:48:32 -0000 1.34
+++ xorg-x11-apps.spec 2 Jul 2009 20:44:58 -0000 1.35
@@ -4,8 +4,8 @@ Summary: X.Org X11 applications
Name: xorg-x11-%{pkgname}
# NOTE: The package version should be set to the X11 major release from which
# the OS release is based upon.
-Version: 7.3
-Release: 10%{?dist}
+Version: 7.4
+Release: 1%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
@@ -32,12 +32,15 @@ Source14: ftp://ftp.x.org/pub/individual
Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.2.tar.bz2
Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.2.tar.bz2
Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.4.99.1.tar.bz2
+Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.0.1.tar.bz2
+Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.2.tar.bz2
+Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
Patch0: x11perf-1.4.1-x11perf-datadir-cleanups.patch
Patch1: luit-1.0.1-locale.alias-datadir.patch
Patch2: xconsole-1.0.3-streams-me-softer.patch
+Patch3: xvidtune-1.0.1-buffer-stomp.patch
-# FIXME: Temporary dependencies on autotools packages for now
BuildRequires: autoconf automake
BuildRequires: pkgconfig
@@ -64,50 +67,47 @@ Requires(pre): xorg-x11-filesystem >= 0.
Provides: luit oclock x11perf xbiff xclipboard xclock xconsole xcursorgen
Provides: xeyes xkill xload xlogo xmag xmessage xpr xwd xwud xinput
+Provides: xfd xfontsel xvidtune
# NOTE: xwd, xwud, luit used to be in these.
Obsoletes: XFree86, xorg-x11
# NOTE: x11perf, xclipboard used to be in these.
Obsoletes: XFree86-tools, xorg-x11-tools
+# Xaw app moves
+Conflicts: xorg-x11-utils < 7.4-5.fc12
+Conflicts: xorg-x11-server-utils < 7.4-8.fc12
+
%description
A collection of common X Window System applications.
%prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20
%patch0 -p0 -b .x11perf-datadir-cleanups
%patch1 -p0 -b .locale.alias-datadir
%patch2 -p0 -b .streams-me-softer
+%patch3 -p1 -b .buffer-stomp
%build
# Build all apps
{
- for app in * ; do
- pushd $app
-
- case $app in
- x11perf*)
- aclocal ; automake ; autoconf
- ;;
- luit*)
- autoconf
- ;;
- esac
-
- %configure --disable-xprint
- make
- popd
- done
+for app in * ; do
+ pushd $app
+ autoreconf -v --install
+ %configure --disable-xprint
+ make
+ popd
+done
}
%install
rm -rf $RPM_BUILD_ROOT
# Install all apps
{
- for app in * ; do
- pushd $app
- make install DESTDIR=$RPM_BUILD_ROOT
- popd
- done
+for app in * ; do
+ pushd $app
+ make install DESTDIR=$RPM_BUILD_ROOT
+ popd
+done
}
%clean
@@ -128,6 +128,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xcutsel
%{_bindir}/xdpr
%{_bindir}/xeyes
+%{_bindir}/xfd
+%{_bindir}/xfontsel
%{_bindir}/xinput
%{_bindir}/xkill
%{_bindir}/xload
@@ -135,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xmag
%{_bindir}/xmessage
%{_bindir}/xpr
+%{_bindir}/xvidtune
%{_bindir}/xwd
%{_bindir}/xwud
%dir %{_datadir}/X11
@@ -143,12 +146,15 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/X11/app-defaults/XClock
%{_datadir}/X11/app-defaults/XClock-color
%{_datadir}/X11/app-defaults/XConsole
+%{_datadir}/X11/app-defaults/XFontSel
+%{_datadir}/X11/app-defaults/Xfd
%{_datadir}/X11/app-defaults/XLoad
%{_datadir}/X11/app-defaults/XLogo
%{_datadir}/X11/app-defaults/XLogo-color
%{_datadir}/X11/app-defaults/Xmag
%{_datadir}/X11/app-defaults/Xmessage
%{_datadir}/X11/app-defaults/Xmessage-color
+%{_datadir}/X11/app-defaults/Xvidtune
%dir %{_datadir}/X11/x11perfcomp
%{_datadir}/X11/x11perfcomp/Xmark
%{_datadir}/X11/x11perfcomp/fillblnk
@@ -168,6 +174,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xcutsel.1*
%{_mandir}/man1/xdpr.1*
%{_mandir}/man1/xeyes.1*
+%{_mandir}/man1/xfd.1*
+%{_mandir}/man1/xfontsel.1*
%{_mandir}/man1/xinput.1*
%{_mandir}/man1/xkill.1*
%{_mandir}/man1/xload.1*
@@ -175,10 +183,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/xmag.1*
%{_mandir}/man1/xmessage.1*
%{_mandir}/man1/xpr.1*
+%{_mandir}/man1/xvidtune.1*
%{_mandir}/man1/xwd.1*
%{_mandir}/man1/xwud.1*
%changelog
+* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-1
+- Add xfd, xfontsel, and xvidtune
+
* Mon Jun 22 2009 Peter Hutterer <peter.hutterer at redhat.com> 7.3-10
- xinput 1.4.99.1
- Previous message (by thread): rpms/eclipse-valgrind/F-11 eclipse-valgrind-massif-unknown-symbols.patch, NONE, 1.1 eclipse-valgrind.spec, 1.9, 1.10
- Next message (by thread): rpms/lvm2/F-11 lvm2-2_02_48-cluster-cpg-new-api-reverse.patch, NONE, 1.1 .cvsignore, 1.65, 1.66 lvm2.spec, 1.157, 1.158 sources, 1.69, 1.70 upstream, 1.58, 1.59 LVM2.2.02.45.tgz.asc, 1.1, NONE lvm2-2_02_46-add-mmc-filter.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list