rpms/simple-scan/devel .cvsignore, 1.5, 1.6 simple-scan.spec, 1.6, 1.7 sources, 1.5, 1.6
by Matthias Clasen
Author: mclasen
Update of /cvs/pkgs/rpms/simple-scan/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21650
Modified Files:
.cvsignore simple-scan.spec sources
Log Message:
2.31.4
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/simple-scan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 8 Jun 2010 03:45:35 -0000 1.5
+++ .cvsignore 30 Jun 2010 23:46:37 -0000 1.6
@@ -1 +1 @@
-simple-scan-2.31.3.tar.bz2
+simple-scan-2.31.4.tar.bz2
Index: simple-scan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/simple-scan/devel/simple-scan.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- simple-scan.spec 8 Jun 2010 03:45:36 -0000 1.6
+++ simple-scan.spec 30 Jun 2010 23:46:37 -0000 1.7
@@ -1,5 +1,5 @@
Name: simple-scan
-Version: 2.31.3
+Version: 2.31.4
Release: 1%{?dist}
Summary: Simple scanning utility
@@ -55,9 +55,6 @@ gconftool-2 --makefile-uninstall-rule \
killall -HUP gconfd-2 || :
fi
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README COPYING ChangeLog
@@ -68,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/simple-scan/
%changelog
+* Wed Jun 30 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.4-1
+- Update to 2.31.4
+
* Mon Jun 7 2010 Matthias Clasen <mclasen(a)redhat.com> - 2.31.3-1
- Update to 2.31.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/simple-scan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 8 Jun 2010 03:45:36 -0000 1.5
+++ sources 30 Jun 2010 23:46:37 -0000 1.6
@@ -1 +1 @@
-dfa23ecab9c463420c388235cca45e85 simple-scan-2.31.3.tar.bz2
+924d2e88d1f72d93d36c612f9c05bd24 simple-scan-2.31.4.tar.bz2
13 years, 5 months
rpms/python-simplejson/devel python-simplejson.spec,1.30,1.31
by Toshio くらとみ
Author: toshio
Update of /cvs/pkgs/rpms/python-simplejson/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21515
Modified Files:
python-simplejson.spec
Log Message:
* Wed Jun 30 2010 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2.1.1-2
- Filter unnecessary provides
- License tag update
- Minor spec file cleanups
Index: python-simplejson.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-simplejson/devel/python-simplejson.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- python-simplejson.spec 21 Jun 2010 19:44:53 -0000 1.30
+++ python-simplejson.spec 30 Jun 2010 23:45:38 -0000 1.31
@@ -1,13 +1,21 @@
-%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if 0%{?fedora} < 13 || 0%{?rhel} < 6
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%endif
+
+%global _use_internal_dependency_generator 0
+%global __find_provides /bin/sh -c "%{_rpmconfigdir}/find-provides | grep -v -E '(_speedups.so)' || /bin/true"
+%global __find_requires /bin/sh -c "%{_rpmconfigdir}/find-requires | grep -v -E '(_speedups.so)' || /bin/true"
Name: python-simplejson
+
Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Simple, fast, extensible JSON encoder/decoder for Python
Group: System Environment/Libraries
-License: MIT
+# The main code is licensed MIT.
+# The docs include jquery which is licensed MIT or GPLv2
+License: MIT and (MIT or GPLv2)
URL: http://undefined.org/python/#simplejson
Source0: http://pypi.python.org/packages/source/s/simplejson/simplejson-%{version}...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,8 +53,7 @@ by default).
%install
rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT \
- --single-version-externally-managed
+%{__python} setup.py install --skip-build --root=$RPM_BUILD_ROOT
%check
nosetests -q
@@ -59,13 +66,18 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc docs LICENSE.txt
%dir %{python_sitearch}/simplejson
-%{python_sitearch}/simplejson-%{version}-py%{pyver}.egg-info
+%{python_sitearch}/simplejson-*.egg-info
%{python_sitearch}/simplejson/*.py*
%{python_sitearch}/simplejson/tests/*.py*
%{python_sitearch}/simplejson/_speedups.so
%changelog
+* Wed Jun 30 2010 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2.1.1-2
+- Filter unnecessary provides
+- License tag update
+- Minor spec file cleanups
+
* Mon Jun 21 2010 Kyle VanderBeek <kylev(a)kylev.com> - 2.1.1-1
- Update to 2.1.1
13 years, 5 months
rpms/xorg-x11-drv-vmmouse/devel vmmouse-12.6.9-iopl-revert.patch, NONE, 1.1 xorg-x11-drv-vmmouse.spec, 1.37, 1.38
by Peter Hutterer
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20467
Modified Files:
xorg-x11-drv-vmmouse.spec
Added Files:
vmmouse-12.6.9-iopl-revert.patch
Log Message:
* Thu Jul 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 12.6.9-4
- vmmouse-12.6.9-iopl-revert.patch: revert removal of iopl(2) call (#640660)
vmmouse-12.6.9-iopl-revert.patch:
vmmouse_detect.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE vmmouse-12.6.9-iopl-revert.patch ---
>From e9ef63e19d8f9993950f1f06299aee1eb18ded9f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Thu, 1 Jul 2010 08:45:53 +1000
Subject: [PATCH] Revert "Remove call to iopl(). It's not portable and isn't necessary."
https://bugzilla.redhat.com/show_bug.cgi?id=604660
For details, see:
https://bugzilla.novell.com/show_bug.cgi?id=604966
This reverts commit bcdec3d0cd4434770cd841c33c030e0d7203881f.
---
tools/vmmouse_detect.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/vmmouse_detect.c b/tools/vmmouse_detect.c
index ac238b4..cfb92e1 100644
--- a/tools/vmmouse_detect.c
+++ b/tools/vmmouse_detect.c
@@ -53,6 +53,11 @@ main(void)
signal(SIGSEGV, segvCB);
#if defined __i386__ || defined __x86_64__
+ /*
+ * To access i/o ports above 0x3ff, we need to be in iopl(3).
+ */
+
+ iopl(3);
if (VMMouseClient_Enable()) {
VMMouseClient_Disable();
return 0;
--
1.7.1
Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/devel/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xorg-x11-drv-vmmouse.spec 20 Jun 2010 23:55:40 -0000 1.37
+++ xorg-x11-drv-vmmouse.spec 30 Jun 2010 23:30:32 -0000 1.38
@@ -5,7 +5,7 @@
Summary: Xorg X11 vmmouse input driver
Name: xorg-x11-drv-vmmouse
Version: 12.6.9
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{versio
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch1: vmmouse-12.6.9-single-udev-match.patch
+# 604660 - vmmouse_detect unexpected exit with status 0x000b
+Patch2: vmmouse-12.6.9-iopl-revert.patch
# Yes, this is not the same as vmware. Yes, this is intentional.
ExclusiveArch: %{ix86} x86_64
@@ -29,6 +31,7 @@ X.Org X11 vmmouse input driver.
%prep
%setup -q -n %{tarball}-%{version}
%patch1 -p1
+%patch2 -p1
%build
%configure --disable-static --with-xorg-conf-dir='%{_datadir}/X11/xorg.conf.d'
@@ -59,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
/lib/udev/rules.d/*.rules
%changelog
+* Thu Jul 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 12.6.9-4
+- vmmouse-12.6.9-iopl-revert.patch: revert removal of iopl(2) call (#640660)
+
* Fri Jun 18 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 12.6.9-3
- vmmouse-12.6.9-single-udev-match.patch: only match event devices once.
13 years, 5 months
rpms/gnome-settings-daemon/devel .cvsignore, 1.47, 1.48 gnome-settings-daemon.spec, 1.162, 1.163 sources, 1.48, 1.49
by Matthias Clasen
Author: mclasen
Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19460
Modified Files:
.cvsignore gnome-settings-daemon.spec sources
Log Message:
2.31.4.2
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- .cvsignore 29 Jun 2010 18:57:45 -0000 1.47
+++ .cvsignore 30 Jun 2010 23:17:21 -0000 1.48
@@ -1 +1 @@
-gnome-settings-daemon-2.31.4.1.tar.bz2
+gnome-settings-daemon-2.31.4.2.tar.bz2
Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- gnome-settings-daemon.spec 29 Jun 2010 18:57:45 -0000 1.162
+++ gnome-settings-daemon.spec 30 Jun 2010 23:17:22 -0000 1.163
@@ -1,5 +1,5 @@
Name: gnome-settings-daemon
-Version: 2.31.4.1
+Version: 2.31.4.2
Release: 1%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
@@ -130,6 +130,9 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
+* Wed Jun 30 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4.2-1
+- Update to 2.31.4.2
+
* Tue Jun 29 2010 Matthias Clasen <mclasen(a)redhat.com> 2.31.4.1-1
- Update to 2.31.4.1
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources 29 Jun 2010 18:57:45 -0000 1.48
+++ sources 30 Jun 2010 23:17:22 -0000 1.49
@@ -1 +1 @@
-97381585f85201e8704a241705f32945 gnome-settings-daemon-2.31.4.1.tar.bz2
+c59dc4b5c0c47f2e3dd013d1ce85ac34 gnome-settings-daemon-2.31.4.2.tar.bz2
13 years, 5 months
rpms/control-center/devel control-center.spec,1.533,1.534
by Matthias Clasen
Author: mclasen
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19419
Modified Files:
control-center.spec
Log Message:
fix file lists
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -p -r1.533 -r1.534
--- control-center.spec 30 Jun 2010 22:39:42 -0000 1.533
+++ control-center.spec 30 Jun 2010 23:16:33 -0000 1.534
@@ -190,6 +190,7 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/gnome-control-center/default-apps/*.xml
%dir %{_datadir}/gnome-control-center/ui
%{_datadir}/gnome-control-center/ui/*.ui
+%{_datadir}/gnome-control-center/datetime
%{_datadir}/gnome-control-center/pixmaps
%{_datadir}/applications/*.desktop
%{_datadir}/desktop-directories/*
13 years, 5 months
rpms/xorg-x11-drv-vmmouse/F-13 vmmouse-12.6.9-iopl-revert.patch, NONE, 1.1 xorg-x11-drv-vmmouse.spec, 1.37, 1.38
by Peter Hutterer
Author: whot
Update of /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18781
Modified Files:
xorg-x11-drv-vmmouse.spec
Added Files:
vmmouse-12.6.9-iopl-revert.patch
Log Message:
* Thu Jul 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 12.6.9-4
- vmmouse-12.6.9-iopl-revert.patch: revert removal of iopl(2) call (#640660)
vmmouse-12.6.9-iopl-revert.patch:
vmmouse_detect.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE vmmouse-12.6.9-iopl-revert.patch ---
>From e9ef63e19d8f9993950f1f06299aee1eb18ded9f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Thu, 1 Jul 2010 08:45:53 +1000
Subject: [PATCH] Revert "Remove call to iopl(). It's not portable and isn't necessary."
https://bugzilla.redhat.com/show_bug.cgi?id=604660
For details, see:
https://bugzilla.novell.com/show_bug.cgi?id=604966
This reverts commit bcdec3d0cd4434770cd841c33c030e0d7203881f.
---
tools/vmmouse_detect.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/vmmouse_detect.c b/tools/vmmouse_detect.c
index ac238b4..cfb92e1 100644
--- a/tools/vmmouse_detect.c
+++ b/tools/vmmouse_detect.c
@@ -53,6 +53,11 @@ main(void)
signal(SIGSEGV, segvCB);
#if defined __i386__ || defined __x86_64__
+ /*
+ * To access i/o ports above 0x3ff, we need to be in iopl(3).
+ */
+
+ iopl(3);
if (VMMouseClient_Enable()) {
VMMouseClient_Disable();
return 0;
--
1.7.1
Index: xorg-x11-drv-vmmouse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-vmmouse/F-13/xorg-x11-drv-vmmouse.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xorg-x11-drv-vmmouse.spec 20 Jun 2010 23:42:23 -0000 1.37
+++ xorg-x11-drv-vmmouse.spec 30 Jun 2010 23:10:15 -0000 1.38
@@ -5,7 +5,7 @@
Summary: Xorg X11 vmmouse input driver
Name: xorg-x11-drv-vmmouse
Version: 12.6.9
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{versio
Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
Patch1: vmmouse-12.6.9-single-udev-match.patch
+# 604660 - vmmouse_detect unexpected exit with status 0x000b
+Patch2: vmmouse-12.6.9-iopl-revert.patch
# Yes, this is not the same as vmware. Yes, this is intentional.
ExclusiveArch: %{ix86} x86_64
@@ -29,6 +31,7 @@ X.Org X11 vmmouse input driver.
%prep
%setup -q -n %{tarball}-%{version}
%patch1 -p1
+%patch2 -p1
%build
%configure --disable-static --with-xorg-conf-dir='%{_datadir}/X11/xorg.conf.d'
@@ -59,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT
/lib/udev/rules.d/*.rules
%changelog
+* Thu Jul 01 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 12.6.9-4
+- vmmouse-12.6.9-iopl-revert.patch: revert removal of iopl(2) call (#640660)
+
* Fri Jun 18 2010 Peter Hutterer <peter.hutterer(a)redhat.com> 12.6.9-3
- vmmouse-12.6.9-single-udev-match.patch: only match event devices once.
13 years, 5 months
rpms/control-center/devel control-center.spec,1.532,1.533
by Matthias Clasen
Author: mclasen
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17095
Modified Files:
control-center.spec
Log Message:
fix spec
Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -p -r1.532 -r1.533
--- control-center.spec 30 Jun 2010 22:37:51 -0000 1.532
+++ control-center.spec 30 Jun 2010 22:39:42 -0000 1.533
@@ -79,8 +79,6 @@ Requires(postun): shared-mime-info
Provides: control-center-extra = %{epoch}:%{version}-%{release}
Obsoletes: control-center-extra < 1:2.30.3-3
-Patch0: seal.patch
-
%description
This package contains configuration utilities for the GNOME desktop, which
allow to configure accessibility options, desktop fonts, keyboard and mouse
@@ -116,7 +114,6 @@ utilities.
%prep
%setup -q -n gnome-control-center-%{version}
-%patch0 -p1 -b .seal
%build
%configure \
13 years, 5 months