diff --git a/.gitignore b/.gitignore index eeca58e..527cd0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/setxkbmap-1.3.0.tar.bz2 -SOURCES/xkbcomp-1.2.4.tar.bz2 +SOURCES/xkbcomp-1.3.0.tar.bz2 SOURCES/xkbevd-1.1.3.tar.bz2 SOURCES/xkbprint-1.0.3.tar.bz2 SOURCES/xkbutils-1.0.4.tar.bz2 diff --git a/.xorg-x11-xkb-utils.metadata b/.xorg-x11-xkb-utils.metadata index 2d7bbb3..8138768 100644 --- a/.xorg-x11-xkb-utils.metadata +++ b/.xorg-x11-xkb-utils.metadata @@ -1,5 +1,5 @@ d10885d6215b06789961c67557df46406f99c2b7 SOURCES/setxkbmap-1.3.0.tar.bz2 -695d2f2824884d9e54aa1419282ae167fdea163b SOURCES/xkbcomp-1.2.4.tar.bz2 +113c93679c9245141b5899240f59fcc8227d8dc1 SOURCES/xkbcomp-1.3.0.tar.bz2 543963ba22b019b4e059e8605eb418f8a712b76e SOURCES/xkbevd-1.1.3.tar.bz2 4e7c91a137f0746202b3a74bbaf49c849484aa30 SOURCES/xkbprint-1.0.3.tar.bz2 b09aef7cc3853eb12dbda332f55adec3add4447b SOURCES/xkbutils-1.0.4.tar.bz2 diff --git a/SOURCES/0001-Always-terminate-the-scanBuf-string-66345.patch b/SOURCES/0001-Always-terminate-the-scanBuf-string-66345.patch deleted file mode 100644 index d20c305..0000000 --- a/SOURCES/0001-Always-terminate-the-scanBuf-string-66345.patch +++ /dev/null @@ -1,131 +0,0 @@ -From cdcd552041fc1325a2a81e3374fadb0dd15950dc Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 11 Jul 2013 13:26:18 +1000 -Subject: [PATCH xkbcomp] Always terminate the scanBuf string (#66345) - -If a key name exceeds 4 characters, the content of scanBuf is not -null-terminated, giving error messages like - -syntax error: line 7 of test.xkb -last scanned symbol is: FOOBARm -Errors encountered in test.xkb; not compiled. - -(last character of the preceding 'maximum' statement in this case) - -X.Org Bug 66345 - -Signed-off-by: Peter Hutterer ---- - xkbscan.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/xkbcomp-1.2.4/xkbscan.c b/xkbscan.c -index 7b91b45..144f315 100644 ---- a/xkbcomp-1.2.4/xkbscan.c -+++ b/xkbcomp-1.2.4/xkbscan.c -@@ -401,6 +401,7 @@ static int - yyGetKeyName(void) - { - int ch, i; -+ int last; - - i = 0; - while (((ch = scanchar()) != EOF) && (ch != '>')) -@@ -466,12 +467,20 @@ yyGetKeyName(void) - if (i < sizeof(scanBuf) - 1) - scanBuf[i++] = ch; - } -+ -+ if (i < sizeof(scanBuf) - i) -+ last = i; -+ else -+ last = sizeof(scanBuf) - 1; -+ -+ scanBuf[last] = '\0'; -+ - if ((ch == '>') && (i < 5)) - { -- scanBuf[i++] = '\0'; - scanStrLine = lineNum; - return KEYNAME; - } -+ - return ERROR_TOK; - } - --- -1.8.2.1 - -From 24d18e0a844041ef82441adb16aa18cc4b4814ae Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg -Date: Wed, 28 Aug 2013 20:03:30 +0200 -Subject: [PATCH xkbcomp] Making sure that a copied string is always - null-terminated (#66345). - -A more minimalistic and formally correct solution. -This amends and extends the previous fix for bug #66345, -fixing not just yyGetKeyName() but also yyGetString(). - -Signed-off-by: Benno Schulenberg - -Fixes a typo from cdcd552 (should be sizeof - 1, not sizeof -i). -Code flows that i is at most sizeof(scanBuf) - 1, so last is not needed. - -Reviewed-by: Peter Hutterer -Signed-off-by: Peter Hutterer ---- - xkbscan.c | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) - -diff --git a/xkbcomp-1.2.4/xkbscan.c b/xkbscan.c -index 144f315..237f520 100644 ---- a/xkbcomp-1.2.4/xkbscan.c -+++ b/xkbcomp-1.2.4/xkbscan.c -@@ -388,9 +388,9 @@ yyGetString(void) - if (i < sizeof(scanBuf) - 1) - scanBuf[i++] = ch; - } -+ scanBuf[i] = '\0'; - if (ch == '"') - { -- scanBuf[i++] = '\0'; - scanStrLine = lineNum; - return STRING; - } -@@ -401,7 +401,6 @@ static int - yyGetKeyName(void) - { - int ch, i; -- int last; - - i = 0; - while (((ch = scanchar()) != EOF) && (ch != '>')) -@@ -463,24 +462,15 @@ yyGetKeyName(void) - else - return ERROR_TOK; - } -- - if (i < sizeof(scanBuf) - 1) - scanBuf[i++] = ch; - } -- -- if (i < sizeof(scanBuf) - i) -- last = i; -- else -- last = sizeof(scanBuf) - 1; -- -- scanBuf[last] = '\0'; -- -+ scanBuf[i] = '\0'; - if ((ch == '>') && (i < 5)) - { - scanStrLine = lineNum; - return KEYNAME; - } -- - return ERROR_TOK; - } - --- -1.8.2.1 - diff --git a/SOURCES/0001-Reset-scan-state-when-opening-a-new-file.patch b/SOURCES/0001-Reset-scan-state-when-opening-a-new-file.patch deleted file mode 100644 index e205251..0000000 --- a/SOURCES/0001-Reset-scan-state-when-opening-a-new-file.patch +++ /dev/null @@ -1,100 +0,0 @@ -From a68c5b7b29eb1433b1be73b50c4248e10eab8e64 Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Thu, 1 Nov 2012 16:37:03 +1100 -Subject: [PATCH] Reset scan state when opening a new file - -When we opened a new file after encountering a parse error, we weren't -resetting our scan state, and continued to read out of the old buffer -rather than that of the new file. - -Fixes a regression introduced in 9887842e ('Use fread() instead of -getc()'). - -Test case: - xkbcomp -lfhlpR "path/to/xkeyboard-config.git/symbols/*" -The Makefiles in that tree would cause parse errors, the resulting directory -file is incomplete (down from ~12000 to ~230 lines). - -Reported-by: Peter Hutterer -Signed-off-by: Daniel Stone ---- - parseutils.c | 2 +- - parseutils.h | 3 +-- - xkbcomp.c | 2 +- - xkbscan.c | 10 +++++++++- - 4 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/xkbcomp-1.2.4/parseutils.c b/parseutils.c -index 253cd9d..a1b6e9e 100644 ---- a/xkbcomp-1.2.4/parseutils.c -+++ b/xkbcomp-1.2.4/parseutils.c -@@ -797,7 +797,7 @@ XKBParseFile(FILE * file, XkbFile ** pRtrn) - { - if (file) - { -- yyin = file; -+ scan_set_file(file); - rtrnValue = NULL; - if (yyparse() == 0) - { -diff --git a/xkbcomp-1.2.4/parseutils.h b/xkbcomp-1.2.4/parseutils.h -index 8b8a6c1..8c381d4 100644 ---- a/xkbcomp-1.2.4/parseutils.h -+++ b/xkbcomp-1.2.4/parseutils.h -@@ -198,11 +198,10 @@ extern int yywrap(void); - - extern int yylex(void); - extern int yyparse(void); -+extern void scan_set_file(FILE *file); - - extern int setScanState(char * /* file */ , - int /* line */ - ); - --extern FILE *yyin; -- - #endif /* XKBPARSE_H */ -diff --git a/xkbcomp-1.2.4/xkbcomp.c b/xkbcomp-1.2.4/xkbcomp.c -index 063ae87..116bcfa 100644 ---- a/xkbcomp-1.2.4/xkbcomp.c -+++ b/xkbcomp-1.2.4/xkbcomp.c -@@ -883,7 +883,7 @@ main(int argc, char *argv[]) - XkbFileInfo result; - Status status; - -- yyin = stdin; -+ scan_set_file(stdin); - uSetEntryFile(NullString); - uSetDebugFile(NullString); - uSetErrorFile(NullString); -diff --git a/xkbcomp-1.2.4/xkbscan.c b/xkbcomp-1.2.4/xkbscan.c -index 22a034f..a05d569 100644 ---- a/xkbcomp-1.2.4/xkbscan.c -+++ b/xkbcomp-1.2.4/xkbscan.c -@@ -37,7 +37,7 @@ - - unsigned int scanDebug; - --FILE *yyin = NULL; -+static FILE *yyin; - - static char scanFileBuf[1024] = {0}; - char *scanFile = scanFileBuf; -@@ -269,6 +269,14 @@ tokText(int tok) - } - #endif - -+void -+scan_set_file(FILE *file) -+{ -+ readBufLen = 0; -+ readBufPos = 0; -+ yyin = file; -+} -+ - static int - scanchar(void) - { --- -1.7.11.7 - diff --git a/SOURCES/0001-compat-don-t-warn-about-redefinition-when-nothing-is.patch b/SOURCES/0001-compat-don-t-warn-about-redefinition-when-nothing-is.patch deleted file mode 100644 index 8723e0c..0000000 --- a/SOURCES/0001-compat-don-t-warn-about-redefinition-when-nothing-is.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 839ccda42d8b088d94324cd77c4be954859914d3 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 28 Aug 2013 15:20:56 +1000 -Subject: [PATCH xkbcomp] compat: don't warn about redefinition when nothing is - defined yet - -info->groupCompat[i] is bzero'd on init, define is 0. Don't warn when that -is the case, otherwise any "group 2 = ..." statement will cause an error. - -Signed-off-by: Peter Hutterer ---- - compat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xkbcomp-1.2.4/compat.c b/compat.c -index 2b00142..f4d82a6 100644 ---- a/xkbcomp-1.2.4/compat.c -+++ b/xkbcomp-1.2.4/compat.c -@@ -274,7 +274,7 @@ AddGroupCompat(CompatInfo * info, unsigned group, GroupCompatInfo * newGC) - { - return True; - } -- if (((gc->fileID == newGC->fileID) && (warningLevel > 0)) -+ if (((gc->defined && gc->fileID == newGC->fileID) && (warningLevel > 0)) - || (warningLevel > 9)) - { - WARN1("Compat map for group %d redefined\n", group + 1); --- -1.8.2.1 - diff --git a/SOURCES/0001-man-document-help-em1-emp-eml.patch b/SOURCES/0001-man-document-help-em1-emp-eml.patch deleted file mode 100644 index 9fa728c..0000000 --- a/SOURCES/0001-man-document-help-em1-emp-eml.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1955fe3e6b65087e596d186f28cde5d76f0f875b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 21 May 2013 15:19:35 +1000 -Subject: [PATCH xkbcomp] man: document -help/-?, -em1, -emp, -eml - -Signed-off-by: Peter Hutterer ---- - man/xkbcomp.man | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/xkbcomp-1.2.4/man/xkbcomp.man b/man/xkbcomp.man -index 0486b7d..667c985 100644 ---- a/xkbcomp-1.2.4/man/xkbcomp.man -+++ b/xkbcomp-1.2.4/man/xkbcomp.man -@@ -47,6 +47,18 @@ Produce a C header file as output (.h extension). - .B \-dflts - Compute defaults for any missing components, such as key names. - .TP 8 -+.B \-em1 \fImsg\fP -+Print \fImsg\fP before printing first error message. -+.TP 8 -+.B \-emp \fImsg\fP -+Print \fImsg\fP at the start of each message line. -+.TP 8 -+.B \-eml \fImsg\fP -+If there were any errors, print \fImsg\fP before exiting. -+.TP 8 -+.B \-help, -? -+Show available options. -+.TP 8 - .B \-I\fIdir\fP - Specifies top-level directories to be searched for files included by the - keymap description. After all directories specified by \-I options --- -1.8.1.4 - diff --git a/SPECS/xorg-x11-xkb-utils.spec b/SPECS/xorg-x11-xkb-utils.spec index ed4b2a7..4b7b185 100644 --- a/SPECS/xorg-x11-xkb-utils.spec +++ b/SPECS/xorg-x11-xkb-utils.spec @@ -1,93 +1,89 @@ -Summary: X.Org X11 xkb utilities -Name: xorg-x11-xkb-utils -Version: 7.7 -Release: 9.1%{?dist} -License: MIT -Group: User Interface/X -URL: http://www.x.org +# Component versions +%define setxkbmap 1.3.0 +%define xkbcomp 1.3.0 +%define xkbevd 1.1.3 +%define xkbprint 1.0.3 +%define xkbutils 1.0.4 + +Summary: X.Org X11 xkb utilities +Name: xorg-x11-xkb-utils +Version: 7.7 +Release: 12%{?dist} +License: MIT +Group: User Interface/X +URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# use the macro so the doc dir is changed automagically -%define xkbutils_version 1.0.4 -Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2 -Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.2.4.tar.bz2 -Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.3.tar.bz2 -Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.3.tar.bz2 -Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.3.0.tar.bz2 - -Patch01: 0001-Reset-scan-state-when-opening-a-new-file.patch -Patch02: 0001-man-document-help-em1-emp-eml.patch -# Bug 968996 - Warning about redefinition of compat map -Patch03: 0001-compat-don-t-warn-about-redefinition-when-nothing-is.patch -# Bug 1002343 - Overlong key names are not null-terminated (2 in 1!) -Patch04: 0001-Always-terminate-the-scanBuf-string-66345.patch - -BuildRequires: pkgconfig -BuildRequires: byacc -BuildRequires: libxkbfile-devel -BuildRequires: libX11-devel -BuildRequires: libXaw-devel -BuildRequires: libXt-devel -# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it: -# gcc -O2 -g -march=i386 -mcpu=i686 -o xkbvleds xkbvleds-xkbvleds.o -# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl -# /usr/bin/ld: cannot find -lXext -# libXext-devel needed for xkbutils (from above error) -BuildRequires: libXext-devel -# FIXME: xkbvleds requires libXext, but autotools doesn't check/require it: -# gcc -O2 -g -march=i386 -mcpu=i686 -o xkbvleds xkbvleds-xkbvleds.o -# xkbvleds-LED.o xkbvleds-utils.o -lXaw7 -lXmu -lXt -lSM -lICE -lXext -lXpm -lX11 -ldl -# /usr/bin/ld: cannot find -lXpm -# libXpm-devel needed for xkbutils (from above error) -BuildRequires: libXpm-devel - -Provides: setxkbmap xkbcomp -Obsoletes: XFree86 xorg-x11 +Source0: http://www.x.org/pub/individual/app/setxkbmap-%{setxkbmap}.tar.bz2 +Source1: http://www.x.org/pub/individual/app/xkbcomp-%{xkbcomp}.tar.bz2 +Source2: http://www.x.org/pub/individual/app/xkbevd-%{xkbevd}.tar.bz2 +Source3: http://www.x.org/pub/individual/app/xkbprint-%{xkbprint}.tar.bz2 +Source4: http://www.x.org/pub/individual/app/xkbutils-%{xkbutils}.tar.bz2 + +BuildRequires: byacc +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xkbfile) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xt) +# xkbutils/xkbvleds requires libXext and libXpm, but autotools don't check/require them: +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xpm) + + +Provides: setxkbmap = %{setxkbmap} +Provides: xkbcomp = %{xkbcomp} + +%description +X.Org X11 xkb core utilities. %package devel -Summary: X.Org X11 xkb utilities development package. -Group: Development/Libraries -Requires: pkgconfig +Summary: X.Org X11 xkb utilities development package +Group: Development/Libraries +Requires: pkgconfig + %description devel X.Org X11 xkb utilities development files. %package -n xorg-x11-xkb-extras -Summary: X.Org X11 xkb gadgets -Provides: xkbevd xkbprint xkbutils - -%description -X.Org X11 xkb core utilities +Summary: X.Org X11 xkb gadgets +Provides: xkbevd = %{xkbevd} +Provides: xkbprint = %{xkbprint} +Provides: xkbutils = %{xkbutils} %description -n xorg-x11-xkb-extras -X.Org X11 xkb gadgets +X.Org X11 xkb gadgets. %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -%patch01 -p1 -%patch02 -p1 -%patch03 -p1 -%patch04 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP -Os" -for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do - pushd $pkg-* - [ $pkg == xkbcomp ] && rm xkbparse.c # force regen - %configure - make V=1 - popd -done +# Build all apps +{ + for app in * ; do + pushd $app + case $app in + xkbcomp-*) + rm xkbparse.c # force regen + ;; + *) + ;; + esac + %configure + make %{?_smp_mflags} + popd + done +} %install -rm -rf $RPM_BUILD_ROOT -for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do - pushd $pkg-* - make install DESTDIR=$RPM_BUILD_ROOT - popd -done - -%clean -rm -rf $RPM_BUILD_ROOT +# Install all apps +{ + for app in * ; do + pushd $app + %make_install + popd + done +} %files %defattr(-,root,root,-) @@ -98,8 +94,8 @@ rm -rf $RPM_BUILD_ROOT %files -n xorg-x11-xkb-extras %defattr(-,root,root,-) -%doc xkbutils-%{xkbutils_version}/COPYING -%doc xkbutils-%{xkbutils_version}/README +%doc xkbutils-%{xkbutils}/COPYING +%doc xkbutils-%{xkbutils}/README %{_bindir}/xkbbell %{_bindir}/xkbevd %{_bindir}/xkbprint @@ -116,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/xkbcomp.pc %changelog +* Mon Apr 20 2015 Peter Hutterer 7.7-12 +- Merge with F22 (#1194895) + * Wed Feb 12 2014 Adam Jackson 7.7-9.1 - Mass rebuild @@ -177,104 +176,3 @@ rm -rf $RPM_BUILD_ROOT * Thu Jul 08 2010 Adam Jackson 7.4-8 - xkbcomp-speed.patch: Backport performance changes from git master. - -* Mon Oct 19 2009 Adam Jackson 7.4-7 -- xkbevd 1.1.0 -- xkbutils 1.0.2 - -* Wed Oct 07 2009 Adam Jackson 7.4-6 -- xkbcomp 1.1.1 - -* Mon Jul 27 2009 Fedora Release Engineering - 7.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 09 2009 Peter Hutterer 7.4-4 -- setxkbmap 1.1.0 - -* Thu Jul 09 2009 Peter Hutterer 7.4-3 -- xkbcomp 1.1.0 - -* Thu Jul 02 2009 Adam Jackson 7.4-2 -- Fix missing %%defattr in -extras - -* Thu Jul 02 2009 Adam Jackson 7.4-1 -- Split Xaw-requiring utilities to extras subpackage - -* Thu Feb 26 2009 Fedora Release Engineering - 7.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Aug 25 2008 Peter Hutterer 7.2-7 -- xkbcomp 1.0.5 -- Remove xkbcomp-1.0.4-open-less.patch. -- xkbcomp-1.0.5-dont-overwrite.patch: Don't overwrite groups unnecessarily. - -* Tue Jul 15 2008 Adam Jackson 7.2-6 -- Fix license tag. - -* Wed Apr 16 2008 Adam Jackson 7.2-5 -- xkbcomp 1.0.4 -- xkbcomp-1.0.4-open-less.patch: Make xkbcomp faster by removing uncredible - fail. - -* Wed Feb 20 2008 Fedora Release Engineering - 7.2-4 -- Autorebuild for GCC 4.3 - -* Thu Aug 23 2007 Adam Jackson - 7.2-3 -- Rebuild for ppc toolchain bug - -* Wed Jul 25 2007 Jeremy Katz - 7.2-2 -- rebuild for toolchain bug - -* Tue Jul 24 2007 Adam Jackson 7.2-1 -- setxkbmap 1.0.4 -- Arbitrary version number bump, to match X.org release numbering. Why not. - -* Mon Jan 08 2007 Adam Jackson 1.0.2-3 -- From OLPC: jam -DHAVE_STRCASECMP into CFLAGS to make xkbcomp (and therefore - X server startup) slightly less painfully slow. - -* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control -- rebuild - -* Wed Jun 21 2006 Mike A. Harris 1.0.2-2 -- Added xkbutils_version macro, which can be used in the Version field - in the future, to help prevent accidental bumping of the package version. - -* Thu Apr 27 2006 Adam Jackson 1.0.2-1 -- Update setxkbmap, xkbevd, and xkbcomp - -* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 -- bump again for double-long bug on ppc(64) - -* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 -- Updated all apps to version 1.0.1 from X11R7.0 - -* Sat Dec 17 2005 Mike A. Harris 1.0.0-1 -- Updated all apps to version 1.0.0 from X11R7 RC4. -- Changed manpage dir from man1x to man1 to match upstream default. - -* Sun Nov 13 2005 Mike A. Harris 0.99.1-2 -- Change from "Conflicts" to "Obsoletes: XFree86, xorg-x11" for upgrades. -- Rebuild against new libXaw 0.99.2-2, which has fixed DT_SONAME. (#173027) - -* Fri Nov 11 2005 Mike A. Harris 0.99.1-1 -- Updated to xkbutils-0.99.1, setxkbmap-0.99.2, xkbcomp-0.99.1, xkbevd-0.99.2, - xkbprint-0.99.1 from X11R7 RC2. - -* Thu Nov 10 2005 Mike A. Harris 0.99.0-3 -- Updated xkbutils to version 0.99.0 from X11R7 RC1. The upstream tarball - changed, but the version stayed the same. -- Updated setxkbmap, xkbcomp, xkbevd, xkbprint. -- Change manpage location to 'man1x' in file manifest. -- Iterate over packages with for loop instead of serialized code duplication. - -* Wed Oct 05 2005 Mike A. Harris 0.99.0-2 -- Use Fedora-Extras style BuildRoot tag. -- Update BuildRequires to use new library package names. -- Tidy up spec file a bit. - -* Wed Aug 24 2005 Mike A. Harris 0.99.0-1 -- Initial build.