rpms/blcr-kmod/F-11 blcr-kmod.spec,1.27,1.28
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/blcr-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6622
Modified Files:
blcr-kmod.spec
Log Message:
* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.21
- rebuild for new kernels
Index: blcr-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/blcr-kmod/F-11/blcr-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- blcr-kmod.spec 5 Nov 2009 19:09:59 -0000 1.27
+++ blcr-kmod.spec 22 Nov 2009 21:37:35 -0000 1.28
@@ -7,7 +7,7 @@
Name: blcr-kmod
Version: 0.8.1
-Release: 3%{?dist}.20
+Release: 3%{?dist}.21
Summary: Kernel module (kmod) for Berkeley Lab Checkpoint/Restart for Linux
%define distname blcr-%{version}
@@ -81,6 +81,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.21
+- rebuild for new kernels
+
* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.20
- rebuild for new kernels
14 years, 5 months
rpms/buildsys-build-rpmfusion/F-11 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.29, 1.30 buildsys-build-rpmfusion.spec, 1.37, 1.38
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5026
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.27
- rebuild for kernel 2.6.30.9-99.fc11
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-11/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- buildsys-build-rpmfusion-kerneldevpkgs-current 5 Nov 2009 18:53:30 -0000 1.29
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 22 Nov 2009 21:19:05 -0000 1.30
@@ -1,3 +1,3 @@
-2.6.30.9-96.fc11
-2.6.30.9-96.fc11smp
-2.6.30.9-96.fc11PAE
+2.6.30.9-99.fc11
+2.6.30.9-99.fc11smp
+2.6.30.9-99.fc11PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-11/buildsys-build-rpmfusion.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- buildsys-build-rpmfusion.spec 5 Nov 2009 18:53:30 -0000 1.37
+++ buildsys-build-rpmfusion.spec 22 Nov 2009 21:19:05 -0000 1.38
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 11
-Release: 0.26
+Release: 0.27
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -90,6 +90,9 @@
%changelog
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.27
+- rebuild for kernel 2.6.30.9-99.fc11
+
* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.26
- rebuild for kernel 2.6.30.9-96.fc11
14 years, 5 months
rpms/snowballz/F-10 snowballz-fonts.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 snowballz-snapshot.sh, 1.2, 1.3 snowballz.spec, 1.3, 1.4 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/snowballz/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4535
Modified Files:
.cvsignore snowballz-snapshot.sh snowballz.spec sources
Added Files:
snowballz-fonts.patch
Log Message:
* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
- Update to latest snapshot (upstream dropped from beta to alpha)
snowballz-fonts.patch:
--- NEW FILE snowballz-fonts.patch ---
diff -rupN snowballz.old/lib/building.py snowballz/lib/building.py
--- snowballz.old/lib/building.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/building.py 2009-11-18 05:14:14.000000000 -0500
@@ -126,7 +126,7 @@ class Igloo(DynamicObjectStore):
center_x = (self.sprite.left+self.sprite.right)/2
# FIXME? under certain circumstances using TSCu_Comic will cause a
# segfault.
- self.label = Label(string,# font_name="TSCu_Comic",
+ self.label = Label(string, font_name="SerafettinCartoon",
x=center_x, y=self.sprite.top, anchor_x="center",
color=(0,0,0,255))
else:
diff -rupN snowballz.old/lib/penguin_control.py snowballz/lib/penguin_control.py
--- snowballz.old/lib/penguin_control.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/penguin_control.py 2009-11-18 05:13:36.000000000 -0500
@@ -85,7 +85,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 25,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
if self.num_workers:
@@ -93,7 +93,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 90,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
for i, u_type in enumerate(["snowballer", "worker"]):
diff -rupN snowballz.old/map_editor.py snowballz/map_editor.py
--- snowballz.old/map_editor.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/map_editor.py 2009-11-18 05:15:25.000000000 -0500
@@ -76,7 +76,7 @@ class ScriptArea(object):
self.sprite.xy = self.scene.map.to_pixel(map_xy)
- self.font = font.load(os.path.join('data', 'TSCu_Comic.ttf'), 13)
+ self.font = font.load(os.path.join('data', 'SerafettinCartoon.ttf'), 13)
self.text = font.Text(self.font, str(self.id))
self.text.x = self.sprite.x
self.text.y = self.sprite.y
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 May 2009 20:50:04 -0000 1.3
+++ .cvsignore 22 Nov 2009 21:11:30 -0000 1.4
@@ -1 +1 @@
-snowballz-1.0-alpha1.20090512hg.tar.bz2
+snowballz-1.0-alpha1.20091118hg.tar.bz2
Index: snowballz-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/snowballz-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snowballz-snapshot.sh 12 May 2009 20:50:04 -0000 1.2
+++ snowballz-snapshot.sh 22 Nov 2009 21:11:30 -0000 1.3
@@ -31,11 +31,7 @@
# Removing the shipped fonts
# No fonts are allowed in Fedora in non-font packages
rm $name/data/*.ttf
-cd $name
-# Get the snowui which will be a part of snowballz final release
-hg clone http://freehg.org/u/joey/snowui/
-rm -fr snowui/.hg*
-cd ..
+
tar jcf "$pwd"/$name-$version.$hg.tar.bz2 $name
-echo "Written: $name-$version-$hg.tar.bz2"
+echo "Written: $name-$version.$hg.tar.bz2"
cd - >/dev/null
Index: snowballz.spec
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/snowballz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- snowballz.spec 5 Jun 2009 20:51:45 -0000 1.3
+++ snowballz.spec 22 Nov 2009 21:11:30 -0000 1.4
@@ -1,8 +1,8 @@
-%define hgver alpha1.20090512hg
+%global hgver alpha1.20091118hg
Name: snowballz
Version: 1.0
-Release: 0.8.%{hgver}%{?dist}
+Release: 0.9.%{hgver}%{?dist}
Summary: A Fun Real Time Strategy Game Featuring Snowball Fights with Penguins
Group: Amusements/Games
License: MIT
@@ -16,7 +16,6 @@
Source4: %{name}.6
# The wrapper script
Source5: %{name}
-
# The hg-fetch script
Source99: %{name}-snapshot.sh
# Don't create a cache file in %%{_datadir}
@@ -24,6 +23,8 @@
# Use simplejson instead of cjson which is not available in F-12+
# Patch sent upstream via email
Patch1: %{name}-json.patch
+# Use our serafettin cartoon fonts instead of the bundled one
+Patch2: %{name}-fonts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -31,6 +32,7 @@
BuildRequires: python-setuptools-devel
BuildRequires: desktop-file-utils
+Requires: font(serafettincartoon)
Requires: pyglet
%if 0%{?fedora} < 11
Requires: python-simplejson
@@ -39,7 +41,6 @@
Requires: python-iniparse
Requires: python-rabbyt
-
%description
Take command of your army of penguins as you blaze your path to victory! March
through snow laden forests to conqueror new frontears and grow your small army.
@@ -56,6 +57,8 @@
%setup -q -n %{name}
%patch0 -p1 -b .dontcache
%patch1 -p1 -b .json
+%patch2 -p1 -b .fonts
+
cp %{SOURCE1} setup.py
# Change the hardcoded path with a macro:
@@ -64,17 +67,11 @@
%build
python setup.py build
-pushd snowui
- python setup.py build
-popd
%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-pushd snowui
- python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-popd
# Kill the egg since the eggs are only needed in python
# libraries that go to site-packages.
@@ -93,9 +90,8 @@
install -p -D -m 0755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
-for txtfile in COPYING README CHANGELOG; do
- mv snowui/$txtfile $txtfile.snowui
-done
+# Create symlink for font
+ln -s ../../fonts/serafettin-cartoon/SerafettinCartoon.ttf %{buildroot}%{_datadir}/%{name}/data/
%clean
rm -rf %{buildroot}
@@ -103,7 +99,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING* README* CHANGELOG*
+%doc README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.xpm
@@ -111,6 +107,9 @@
%{_mandir}/man6/%{name}.*
%changelog
+* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
+- Update to latest snapshot (upstream dropped from beta to alpha)
+
* Mon Jun 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.8.beta1.20090512hg
- Use simplejson (natively available in python2.6+) instead of cjson
- Add missing Requires: python-imaging
Index: sources
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 May 2009 20:50:04 -0000 1.3
+++ sources 22 Nov 2009 21:11:30 -0000 1.4
@@ -1 +1 @@
-c74bd6018ad569b1e7c82d0278e5b74e snowballz-1.0-alpha1.20090512hg.tar.bz2
+f4bfc1271626ac3dc60a18d749355c31 snowballz-1.0-alpha1.20091118hg.tar.bz2
14 years, 5 months
rpms/snowballz/F-11 snowballz-fonts.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 snowballz-snapshot.sh, 1.2, 1.3 snowballz.spec, 1.4, 1.5 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/snowballz/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4062
Modified Files:
.cvsignore snowballz-snapshot.sh snowballz.spec sources
Added Files:
snowballz-fonts.patch
Log Message:
* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
- Update to latest snapshot (upstream dropped from beta to alpha)
snowballz-fonts.patch:
--- NEW FILE snowballz-fonts.patch ---
diff -rupN snowballz.old/lib/building.py snowballz/lib/building.py
--- snowballz.old/lib/building.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/building.py 2009-11-18 05:14:14.000000000 -0500
@@ -126,7 +126,7 @@ class Igloo(DynamicObjectStore):
center_x = (self.sprite.left+self.sprite.right)/2
# FIXME? under certain circumstances using TSCu_Comic will cause a
# segfault.
- self.label = Label(string,# font_name="TSCu_Comic",
+ self.label = Label(string, font_name="SerafettinCartoon",
x=center_x, y=self.sprite.top, anchor_x="center",
color=(0,0,0,255))
else:
diff -rupN snowballz.old/lib/penguin_control.py snowballz/lib/penguin_control.py
--- snowballz.old/lib/penguin_control.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/penguin_control.py 2009-11-18 05:13:36.000000000 -0500
@@ -85,7 +85,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 25,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
if self.num_workers:
@@ -93,7 +93,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 90,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
for i, u_type in enumerate(["snowballer", "worker"]):
diff -rupN snowballz.old/map_editor.py snowballz/map_editor.py
--- snowballz.old/map_editor.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/map_editor.py 2009-11-18 05:15:25.000000000 -0500
@@ -76,7 +76,7 @@ class ScriptArea(object):
self.sprite.xy = self.scene.map.to_pixel(map_xy)
- self.font = font.load(os.path.join('data', 'TSCu_Comic.ttf'), 13)
+ self.font = font.load(os.path.join('data', 'SerafettinCartoon.ttf'), 13)
self.text = font.Text(self.font, str(self.id))
self.text.x = self.sprite.x
self.text.y = self.sprite.y
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 May 2009 20:44:42 -0000 1.3
+++ .cvsignore 22 Nov 2009 21:09:40 -0000 1.4
@@ -1 +1 @@
-snowballz-1.0-alpha1.20090512hg.tar.bz2
+snowballz-1.0-alpha1.20091118hg.tar.bz2
Index: snowballz-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-11/snowballz-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snowballz-snapshot.sh 12 May 2009 20:44:42 -0000 1.2
+++ snowballz-snapshot.sh 22 Nov 2009 21:09:40 -0000 1.3
@@ -31,11 +31,7 @@
# Removing the shipped fonts
# No fonts are allowed in Fedora in non-font packages
rm $name/data/*.ttf
-cd $name
-# Get the snowui which will be a part of snowballz final release
-hg clone http://freehg.org/u/joey/snowui/
-rm -fr snowui/.hg*
-cd ..
+
tar jcf "$pwd"/$name-$version.$hg.tar.bz2 $name
-echo "Written: $name-$version-$hg.tar.bz2"
+echo "Written: $name-$version.$hg.tar.bz2"
cd - >/dev/null
Index: snowballz.spec
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-11/snowballz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snowballz.spec 5 Jun 2009 20:51:03 -0000 1.4
+++ snowballz.spec 22 Nov 2009 21:09:40 -0000 1.5
@@ -1,8 +1,8 @@
-%define hgver alpha1.20090512hg
+%global hgver alpha1.20091118hg
Name: snowballz
Version: 1.0
-Release: 0.8.%{hgver}%{?dist}
+Release: 0.9.%{hgver}%{?dist}
Summary: A Fun Real Time Strategy Game Featuring Snowball Fights with Penguins
Group: Amusements/Games
License: MIT
@@ -16,7 +16,6 @@
Source4: %{name}.6
# The wrapper script
Source5: %{name}
-
# The hg-fetch script
Source99: %{name}-snapshot.sh
# Don't create a cache file in %%{_datadir}
@@ -24,6 +23,8 @@
# Use simplejson instead of cjson which is not available in F-12+
# Patch sent upstream via email
Patch1: %{name}-json.patch
+# Use our serafettin cartoon fonts instead of the bundled one
+Patch2: %{name}-fonts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -31,6 +32,7 @@
BuildRequires: python-setuptools-devel
BuildRequires: desktop-file-utils
+Requires: font(serafettincartoon)
Requires: pyglet
%if 0%{?fedora} < 11
Requires: python-simplejson
@@ -39,7 +41,6 @@
Requires: python-iniparse
Requires: python-rabbyt
-
%description
Take command of your army of penguins as you blaze your path to victory! March
through snow laden forests to conqueror new frontears and grow your small army.
@@ -56,6 +57,8 @@
%setup -q -n %{name}
%patch0 -p1 -b .dontcache
%patch1 -p1 -b .json
+%patch2 -p1 -b .fonts
+
cp %{SOURCE1} setup.py
# Change the hardcoded path with a macro:
@@ -64,17 +67,11 @@
%build
python setup.py build
-pushd snowui
- python setup.py build
-popd
%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-pushd snowui
- python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-popd
# Kill the egg since the eggs are only needed in python
# libraries that go to site-packages.
@@ -93,9 +90,8 @@
install -p -D -m 0755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
-for txtfile in COPYING README CHANGELOG; do
- mv snowui/$txtfile $txtfile.snowui
-done
+# Create symlink for font
+ln -s ../../fonts/serafettin-cartoon/SerafettinCartoon.ttf %{buildroot}%{_datadir}/%{name}/data/
%clean
rm -rf %{buildroot}
@@ -103,7 +99,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING* README* CHANGELOG*
+%doc README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.xpm
@@ -111,6 +107,9 @@
%{_mandir}/man6/%{name}.*
%changelog
+* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
+- Update to latest snapshot (upstream dropped from beta to alpha)
+
* Mon Jun 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.8.beta1.20090512hg
- Use simplejson (natively available in python2.6+) instead of cjson
- Add missing Requires: python-imaging
Index: sources
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 May 2009 20:44:42 -0000 1.3
+++ sources 22 Nov 2009 21:09:40 -0000 1.4
@@ -1 +1 @@
-c74bd6018ad569b1e7c82d0278e5b74e snowballz-1.0-alpha1.20090512hg.tar.bz2
+f4bfc1271626ac3dc60a18d749355c31 snowballz-1.0-alpha1.20091118hg.tar.bz2
14 years, 5 months
rpms/snowballz/F-12 .cvsignore,1.3,1.4 sources,1.3,1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/snowballz/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3902
Modified Files:
.cvsignore sources
Log Message:
Actually upload the new source
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 May 2009 20:44:42 -0000 1.3
+++ .cvsignore 22 Nov 2009 21:07:48 -0000 1.4
@@ -1 +1 @@
-snowballz-1.0-alpha1.20090512hg.tar.bz2
+snowballz-1.0-alpha1.20091118hg.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 May 2009 20:44:42 -0000 1.3
+++ sources 22 Nov 2009 21:07:48 -0000 1.4
@@ -1 +1 @@
-c74bd6018ad569b1e7c82d0278e5b74e snowballz-1.0-alpha1.20090512hg.tar.bz2
+f4bfc1271626ac3dc60a18d749355c31 snowballz-1.0-alpha1.20091118hg.tar.bz2
14 years, 5 months
rpms/snowballz/F-12 snowballz-fonts.patch, NONE, 1.1 snowballz-snapshot.sh, 1.2, 1.3 snowballz.spec, 1.4, 1.5
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/snowballz/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3748
Modified Files:
snowballz-snapshot.sh snowballz.spec
Added Files:
snowballz-fonts.patch
Log Message:
* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
- Update to latest snapshot (upstream dropped from beta to alpha)
snowballz-fonts.patch:
--- NEW FILE snowballz-fonts.patch ---
diff -rupN snowballz.old/lib/building.py snowballz/lib/building.py
--- snowballz.old/lib/building.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/building.py 2009-11-18 05:14:14.000000000 -0500
@@ -126,7 +126,7 @@ class Igloo(DynamicObjectStore):
center_x = (self.sprite.left+self.sprite.right)/2
# FIXME? under certain circumstances using TSCu_Comic will cause a
# segfault.
- self.label = Label(string,# font_name="TSCu_Comic",
+ self.label = Label(string, font_name="SerafettinCartoon",
x=center_x, y=self.sprite.top, anchor_x="center",
color=(0,0,0,255))
else:
diff -rupN snowballz.old/lib/penguin_control.py snowballz/lib/penguin_control.py
--- snowballz.old/lib/penguin_control.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/penguin_control.py 2009-11-18 05:13:36.000000000 -0500
@@ -85,7 +85,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 25,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
if self.num_workers:
@@ -93,7 +93,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 90,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
for i, u_type in enumerate(["snowballer", "worker"]):
diff -rupN snowballz.old/map_editor.py snowballz/map_editor.py
--- snowballz.old/map_editor.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/map_editor.py 2009-11-18 05:15:25.000000000 -0500
@@ -76,7 +76,7 @@ class ScriptArea(object):
self.sprite.xy = self.scene.map.to_pixel(map_xy)
- self.font = font.load(os.path.join('data', 'TSCu_Comic.ttf'), 13)
+ self.font = font.load(os.path.join('data', 'SerafettinCartoon.ttf'), 13)
self.text = font.Text(self.font, str(self.id))
self.text.x = self.sprite.x
self.text.y = self.sprite.y
Index: snowballz-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-12/snowballz-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snowballz-snapshot.sh 12 May 2009 20:44:42 -0000 1.2
+++ snowballz-snapshot.sh 22 Nov 2009 21:06:12 -0000 1.3
@@ -31,11 +31,7 @@
# Removing the shipped fonts
# No fonts are allowed in Fedora in non-font packages
rm $name/data/*.ttf
-cd $name
-# Get the snowui which will be a part of snowballz final release
-hg clone http://freehg.org/u/joey/snowui/
-rm -fr snowui/.hg*
-cd ..
+
tar jcf "$pwd"/$name-$version.$hg.tar.bz2 $name
-echo "Written: $name-$version-$hg.tar.bz2"
+echo "Written: $name-$version.$hg.tar.bz2"
cd - >/dev/null
Index: snowballz.spec
===================================================================
RCS file: /cvs/free/rpms/snowballz/F-12/snowballz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snowballz.spec 5 Jun 2009 20:48:38 -0000 1.4
+++ snowballz.spec 22 Nov 2009 21:06:12 -0000 1.5
@@ -1,8 +1,8 @@
-%define hgver alpha1.20090512hg
+%global hgver alpha1.20091118hg
Name: snowballz
Version: 1.0
-Release: 0.8.%{hgver}%{?dist}
+Release: 0.9.%{hgver}%{?dist}
Summary: A Fun Real Time Strategy Game Featuring Snowball Fights with Penguins
Group: Amusements/Games
License: MIT
@@ -16,7 +16,6 @@
Source4: %{name}.6
# The wrapper script
Source5: %{name}
-
# The hg-fetch script
Source99: %{name}-snapshot.sh
# Don't create a cache file in %%{_datadir}
@@ -24,6 +23,8 @@
# Use simplejson instead of cjson which is not available in F-12+
# Patch sent upstream via email
Patch1: %{name}-json.patch
+# Use our serafettin cartoon fonts instead of the bundled one
+Patch2: %{name}-fonts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -31,6 +32,7 @@
BuildRequires: python-setuptools-devel
BuildRequires: desktop-file-utils
+Requires: font(serafettincartoon)
Requires: pyglet
%if 0%{?fedora} < 11
Requires: python-simplejson
@@ -39,7 +41,6 @@
Requires: python-iniparse
Requires: python-rabbyt
-
%description
Take command of your army of penguins as you blaze your path to victory! March
through snow laden forests to conqueror new frontears and grow your small army.
@@ -56,6 +57,8 @@
%setup -q -n %{name}
%patch0 -p1 -b .dontcache
%patch1 -p1 -b .json
+%patch2 -p1 -b .fonts
+
cp %{SOURCE1} setup.py
# Change the hardcoded path with a macro:
@@ -64,17 +67,11 @@
%build
python setup.py build
-pushd snowui
- python setup.py build
-popd
%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-pushd snowui
- python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-popd
# Kill the egg since the eggs are only needed in python
# libraries that go to site-packages.
@@ -93,9 +90,8 @@
install -p -D -m 0755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
-for txtfile in COPYING README CHANGELOG; do
- mv snowui/$txtfile $txtfile.snowui
-done
+# Create symlink for font
+ln -s ../../fonts/serafettin-cartoon/SerafettinCartoon.ttf %{buildroot}%{_datadir}/%{name}/data/
%clean
rm -rf %{buildroot}
@@ -103,7 +99,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING* README* CHANGELOG*
+%doc README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.xpm
@@ -111,6 +107,9 @@
%{_mandir}/man6/%{name}.*
%changelog
+* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
+- Update to latest snapshot (upstream dropped from beta to alpha)
+
* Mon Jun 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.8.beta1.20090512hg
- Use simplejson (natively available in python2.6+) instead of cjson
- Add missing Requires: python-imaging
14 years, 5 months
rpms/snowballz/devel snowballz-fonts.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 snowballz-snapshot.sh, 1.2, 1.3 snowballz.spec, 1.4, 1.5 sources, 1.3, 1.4
by Orcan Ogetbil
Author: oget
Update of /cvs/free/rpms/snowballz/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2941
Modified Files:
.cvsignore snowballz-snapshot.sh snowballz.spec sources
Added Files:
snowballz-fonts.patch
Log Message:
* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
- Update to latest snapshot (upstream dropped from beta to alpha)
snowballz-fonts.patch:
--- NEW FILE snowballz-fonts.patch ---
diff -rupN snowballz.old/lib/building.py snowballz/lib/building.py
--- snowballz.old/lib/building.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/building.py 2009-11-18 05:14:14.000000000 -0500
@@ -126,7 +126,7 @@ class Igloo(DynamicObjectStore):
center_x = (self.sprite.left+self.sprite.right)/2
# FIXME? under certain circumstances using TSCu_Comic will cause a
# segfault.
- self.label = Label(string,# font_name="TSCu_Comic",
+ self.label = Label(string, font_name="SerafettinCartoon",
x=center_x, y=self.sprite.top, anchor_x="center",
color=(0,0,0,255))
else:
diff -rupN snowballz.old/lib/penguin_control.py snowballz/lib/penguin_control.py
--- snowballz.old/lib/penguin_control.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/lib/penguin_control.py 2009-11-18 05:13:36.000000000 -0500
@@ -85,7 +85,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 25,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
if self.num_workers:
@@ -93,7 +93,7 @@ class PenguinControl:
x = self.unit_selection_sprite.right - 20,
y = self.unit_selection_sprite.top - 90,
font_size = 17,
- font_name = "TSCu_Comic",
+ font_name = "SerafettinCartoon",
color = (100,0,0,255)))
for i, u_type in enumerate(["snowballer", "worker"]):
diff -rupN snowballz.old/map_editor.py snowballz/map_editor.py
--- snowballz.old/map_editor.py 2009-11-18 04:59:48.000000000 -0500
+++ snowballz/map_editor.py 2009-11-18 05:15:25.000000000 -0500
@@ -76,7 +76,7 @@ class ScriptArea(object):
self.sprite.xy = self.scene.map.to_pixel(map_xy)
- self.font = font.load(os.path.join('data', 'TSCu_Comic.ttf'), 13)
+ self.font = font.load(os.path.join('data', 'SerafettinCartoon.ttf'), 13)
self.text = font.Text(self.font, str(self.id))
self.text.x = self.sprite.x
self.text.y = self.sprite.y
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/snowballz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 12 May 2009 20:44:42 -0000 1.3
+++ .cvsignore 22 Nov 2009 20:58:53 -0000 1.4
@@ -1 +1 @@
-snowballz-1.0-alpha1.20090512hg.tar.bz2
+snowballz-1.0-alpha1.20091118hg.tar.bz2
Index: snowballz-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/snowballz/devel/snowballz-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- snowballz-snapshot.sh 12 May 2009 20:44:42 -0000 1.2
+++ snowballz-snapshot.sh 22 Nov 2009 20:58:53 -0000 1.3
@@ -31,11 +31,7 @@
# Removing the shipped fonts
# No fonts are allowed in Fedora in non-font packages
rm $name/data/*.ttf
-cd $name
-# Get the snowui which will be a part of snowballz final release
-hg clone http://freehg.org/u/joey/snowui/
-rm -fr snowui/.hg*
-cd ..
+
tar jcf "$pwd"/$name-$version.$hg.tar.bz2 $name
-echo "Written: $name-$version-$hg.tar.bz2"
+echo "Written: $name-$version.$hg.tar.bz2"
cd - >/dev/null
Index: snowballz.spec
===================================================================
RCS file: /cvs/free/rpms/snowballz/devel/snowballz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- snowballz.spec 5 Jun 2009 20:48:38 -0000 1.4
+++ snowballz.spec 22 Nov 2009 20:58:53 -0000 1.5
@@ -1,8 +1,8 @@
-%define hgver alpha1.20090512hg
+%global hgver alpha1.20091118hg
Name: snowballz
Version: 1.0
-Release: 0.8.%{hgver}%{?dist}
+Release: 0.9.%{hgver}%{?dist}
Summary: A Fun Real Time Strategy Game Featuring Snowball Fights with Penguins
Group: Amusements/Games
License: MIT
@@ -16,7 +16,6 @@
Source4: %{name}.6
# The wrapper script
Source5: %{name}
-
# The hg-fetch script
Source99: %{name}-snapshot.sh
# Don't create a cache file in %%{_datadir}
@@ -24,6 +23,8 @@
# Use simplejson instead of cjson which is not available in F-12+
# Patch sent upstream via email
Patch1: %{name}-json.patch
+# Use our serafettin cartoon fonts instead of the bundled one
+Patch2: %{name}-fonts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -31,6 +32,7 @@
BuildRequires: python-setuptools-devel
BuildRequires: desktop-file-utils
+Requires: font(serafettincartoon)
Requires: pyglet
%if 0%{?fedora} < 11
Requires: python-simplejson
@@ -39,7 +41,6 @@
Requires: python-iniparse
Requires: python-rabbyt
-
%description
Take command of your army of penguins as you blaze your path to victory! March
through snow laden forests to conqueror new frontears and grow your small army.
@@ -56,6 +57,8 @@
%setup -q -n %{name}
%patch0 -p1 -b .dontcache
%patch1 -p1 -b .json
+%patch2 -p1 -b .fonts
+
cp %{SOURCE1} setup.py
# Change the hardcoded path with a macro:
@@ -64,17 +67,11 @@
%build
python setup.py build
-pushd snowui
- python setup.py build
-popd
%install
rm -rf %{buildroot}
python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-pushd snowui
- python setup.py install --skip-build --root %{buildroot} --install-lib %{_datadir}/%{name}
-popd
# Kill the egg since the eggs are only needed in python
# libraries that go to site-packages.
@@ -93,9 +90,8 @@
install -p -D -m 0755 %{name}-wrapper %{buildroot}%{_bindir}/%{name}
-for txtfile in COPYING README CHANGELOG; do
- mv snowui/$txtfile $txtfile.snowui
-done
+# Create symlink for font
+ln -s ../../fonts/serafettin-cartoon/SerafettinCartoon.ttf %{buildroot}%{_datadir}/%{name}/data/
%clean
rm -rf %{buildroot}
@@ -103,7 +99,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING* README* CHANGELOG*
+%doc README
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/pixmaps/%{name}.xpm
@@ -111,6 +107,9 @@
%{_mandir}/man6/%{name}.*
%changelog
+* Wed Nov 18 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.9.alpha1.20091118hg
+- Update to latest snapshot (upstream dropped from beta to alpha)
+
* Mon Jun 01 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0-0.8.beta1.20090512hg
- Use simplejson (natively available in python2.6+) instead of cjson
- Add missing Requires: python-imaging
Index: sources
===================================================================
RCS file: /cvs/free/rpms/snowballz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 12 May 2009 20:44:42 -0000 1.3
+++ sources 22 Nov 2009 20:58:53 -0000 1.4
@@ -1 +1 @@
-c74bd6018ad569b1e7c82d0278e5b74e snowballz-1.0-alpha1.20090512hg.tar.bz2
+f4bfc1271626ac3dc60a18d749355c31 snowballz-1.0-alpha1.20091118hg.tar.bz2
14 years, 5 months
rpms/nvidia-settings/F-11 nvidia-settings-1.0-default.patch, NONE, 1.1 nvidia-settings.desktop, NONE, 1.1 nvidia-settings.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9647/F-11
Modified Files:
.cvsignore sources
Added Files:
nvidia-settings-1.0-default.patch nvidia-settings.desktop
nvidia-settings.spec
Log Message:
Initial import for F-11
nvidia-settings-1.0-default.patch:
--- NEW FILE nvidia-settings-1.0-default.patch ---
diff -up nvidia-settings-1.0/Makefile.default nvidia-settings-1.0/Makefile
--- nvidia-settings-1.0/Makefile.default 2008-06-06 21:25:57.000000000 +0200
+++ nvidia-settings-1.0/Makefile 2008-06-06 21:30:15.000000000 +0200
@@ -102,10 +102,10 @@ LD_RUN_FLAG=-R/usr/X11R6/lib
else
ECHO=echo
define INSTALL_RULE
+ mkdir -p $(bindir)
$(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
mkdir -p $(mandir)
$(INSTALL) -m 644 doc/$(MANPAGE) $(mandir)
- gzip -9f $(mandir)/$(MANPAGE)
endef
endif
@@ -118,7 +118,7 @@ X11_CFLAGS = $(X11_INC_DIRS)
GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
-X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -lX11 -lXext
+X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bdynamic -lX11 -lXext -lXxf86vm
XNVCTRL_LIB := src/libXNVCtrl/libXNVCtrl.a
XNVCTRL_DIR := src/libXNVCtrl
@@ -195,7 +195,6 @@ DEPS := $(patsubst %.c,$(DEPS_DIR)/%.d,$
all: $(NVIDIA_SETTINGS) doc/$(MANPAGE)
install: all
- $(STRIP) $(NVIDIA_SETTINGS)
$(INSTALL_RULE)
$(OBJS_DIR)/%.o: %.c
--- NEW FILE nvidia-settings.desktop ---
[Desktop Entry]
Name=nVidia Display Settings
Comment=Configure the nVidia driver
Exec=nvidia-settings
Terminal=false
Icon=nvidia-settings
Type=Application
Categories=System;
--- NEW FILE nvidia-settings.spec ---
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
%global nversion 190.42
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
Release: 3.2%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: MIT
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
Source1: nvidia-settings.desktop
Patch0: nvidia-settings-1.0-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
%endif
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
#BuildRequires: libXNVCtrl-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: libXv-devel
#Needed for FBConfig table
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
%description
The nvidia-settings utility is a tool for configuring the NVIDIA graphics
driver. It operates by communicating with the NVIDIA X driver, querying
and updating state as appropriate.
This communication is done with the NV-CONTROL X extension.
nvidia-settings is compatible with driver up to %{nversion}.
%prep
%setup -q
%patch0 -p1 -b .default
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
sed -i -e 's|# X11R6_DIR = /usr/X11R6|X11R6_DIR = %{_prefix}|' Makefile
sed -i -e 's|CFLAGS = -Wall -g|CFLAGS = $(RPM_OPT_FLAGS)|' src/XF86Config-parser/Makefile
%build
# no job control
make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia -DX_XF86VidModeGetGammaRampSize"
%install
rm -rf $RPM_BUILD_ROOT
make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
%{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc doc/*.txt
%{_bindir}/nvidia-settings
%{_datadir}/applications/*nvidia-settings.desktop
%{_mandir}/man1/nvidia-settings.1.gz
%changelog
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
* Thu Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
- Update internal to 185.18.14
* Tue Mar 3 2009 kwizart < kwizart at gmail.com > - 1.0-2.1
- Update internal to 180.35
* Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 1.0-2
- Update to 173.14.09
- Remove the locale patch
* Wed May 28 2008 kwizart < kwizart at gmail.com > - 1.0-1
- First Package for Fedora.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2009 14:10:14 -0000 1.1
+++ .cvsignore 22 Nov 2009 14:48:13 -0000 1.2
@@ -0,0 +1 @@
+nvidia-settings-190.42.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Nov 2009 14:10:14 -0000 1.1
+++ sources 22 Nov 2009 14:48:13 -0000 1.2
@@ -0,0 +1 @@
+eb0cbb9f57ecf0d5a4a4804b7e257b10 nvidia-settings-190.42.tar.gz
14 years, 5 months
rpms/nvidia-settings/F-12 nvidia-settings-1.0-default.patch, NONE, 1.1 nvidia-settings.desktop, NONE, 1.1 nvidia-settings.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9416/F-12
Modified Files:
.cvsignore sources
Added Files:
nvidia-settings-1.0-default.patch nvidia-settings.desktop
nvidia-settings.spec
Log Message:
Initial import for F-12
nvidia-settings-1.0-default.patch:
--- NEW FILE nvidia-settings-1.0-default.patch ---
diff -up nvidia-settings-1.0/Makefile.default nvidia-settings-1.0/Makefile
--- nvidia-settings-1.0/Makefile.default 2008-06-06 21:25:57.000000000 +0200
+++ nvidia-settings-1.0/Makefile 2008-06-06 21:30:15.000000000 +0200
@@ -102,10 +102,10 @@ LD_RUN_FLAG=-R/usr/X11R6/lib
else
ECHO=echo
define INSTALL_RULE
+ mkdir -p $(bindir)
$(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
mkdir -p $(mandir)
$(INSTALL) -m 644 doc/$(MANPAGE) $(mandir)
- gzip -9f $(mandir)/$(MANPAGE)
endef
endif
@@ -118,7 +118,7 @@ X11_CFLAGS = $(X11_INC_DIRS)
GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
-X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -lX11 -lXext
+X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bdynamic -lX11 -lXext -lXxf86vm
XNVCTRL_LIB := src/libXNVCtrl/libXNVCtrl.a
XNVCTRL_DIR := src/libXNVCtrl
@@ -195,7 +195,6 @@ DEPS := $(patsubst %.c,$(DEPS_DIR)/%.d,$
all: $(NVIDIA_SETTINGS) doc/$(MANPAGE)
install: all
- $(STRIP) $(NVIDIA_SETTINGS)
$(INSTALL_RULE)
$(OBJS_DIR)/%.o: %.c
--- NEW FILE nvidia-settings.desktop ---
[Desktop Entry]
Name=nVidia Display Settings
Comment=Configure the nVidia driver
Exec=nvidia-settings
Terminal=false
Icon=nvidia-settings
Type=Application
Categories=System;
--- NEW FILE nvidia-settings.spec ---
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
%global nversion 190.42
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
Release: 3.2%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: MIT
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
Source1: nvidia-settings.desktop
Patch0: nvidia-settings-1.0-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
%endif
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
#BuildRequires: libXNVCtrl-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: libXv-devel
#Needed for FBConfig table
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
%description
The nvidia-settings utility is a tool for configuring the NVIDIA graphics
driver. It operates by communicating with the NVIDIA X driver, querying
and updating state as appropriate.
This communication is done with the NV-CONTROL X extension.
nvidia-settings is compatible with driver up to %{nversion}.
%prep
%setup -q
%patch0 -p1 -b .default
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
sed -i -e 's|# X11R6_DIR = /usr/X11R6|X11R6_DIR = %{_prefix}|' Makefile
sed -i -e 's|CFLAGS = -Wall -g|CFLAGS = $(RPM_OPT_FLAGS)|' src/XF86Config-parser/Makefile
%build
# no job control
make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia -DX_XF86VidModeGetGammaRampSize"
%install
rm -rf $RPM_BUILD_ROOT
make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
%{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc doc/*.txt
%{_bindir}/nvidia-settings
%{_datadir}/applications/*nvidia-settings.desktop
%{_mandir}/man1/nvidia-settings.1.gz
%changelog
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
* Thu Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
- Update internal to 185.18.14
* Tue Mar 3 2009 kwizart < kwizart at gmail.com > - 1.0-2.1
- Update internal to 180.35
* Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 1.0-2
- Update to 173.14.09
- Remove the locale patch
* Wed May 28 2008 kwizart < kwizart at gmail.com > - 1.0-1
- First Package for Fedora.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2009 14:10:14 -0000 1.1
+++ .cvsignore 22 Nov 2009 14:46:40 -0000 1.2
@@ -0,0 +1 @@
+nvidia-settings-190.42.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Nov 2009 14:10:14 -0000 1.1
+++ sources 22 Nov 2009 14:46:40 -0000 1.2
@@ -0,0 +1 @@
+eb0cbb9f57ecf0d5a4a4804b7e257b10 nvidia-settings-190.42.tar.gz
14 years, 5 months
rpms/nvidia-settings/devel nvidia-settings-1.0-default.patch, NONE, 1.1 nvidia-settings.desktop, NONE, 1.1 nvidia-settings.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-settings/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9167/devel
Modified Files:
.cvsignore sources
Added Files:
nvidia-settings-1.0-default.patch nvidia-settings.desktop
nvidia-settings.spec
Log Message:
Initial import in devel
nvidia-settings-1.0-default.patch:
--- NEW FILE nvidia-settings-1.0-default.patch ---
diff -up nvidia-settings-1.0/Makefile.default nvidia-settings-1.0/Makefile
--- nvidia-settings-1.0/Makefile.default 2008-06-06 21:25:57.000000000 +0200
+++ nvidia-settings-1.0/Makefile 2008-06-06 21:30:15.000000000 +0200
@@ -102,10 +102,10 @@ LD_RUN_FLAG=-R/usr/X11R6/lib
else
ECHO=echo
define INSTALL_RULE
+ mkdir -p $(bindir)
$(INSTALL) -m 755 $(NVIDIA_SETTINGS) $(bindir)/$(NVIDIA_SETTINGS)
mkdir -p $(mandir)
$(INSTALL) -m 644 doc/$(MANPAGE) $(mandir)
- gzip -9f $(mandir)/$(MANPAGE)
endef
endif
@@ -118,7 +118,7 @@ X11_CFLAGS = $(X11_INC_DIRS)
GTK_CFLAGS := $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
GTK_LDFLAGS := $(shell $(PKG_CONFIG) --libs gtk+-2.0)
-X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bstatic -lXxf86vm -Wl,-Bdynamic -lX11 -lXext
+X11_LIBS := $(X11_LIB_DIRS) -Wl,-Bdynamic -lX11 -lXext -lXxf86vm
XNVCTRL_LIB := src/libXNVCtrl/libXNVCtrl.a
XNVCTRL_DIR := src/libXNVCtrl
@@ -195,7 +195,6 @@ DEPS := $(patsubst %.c,$(DEPS_DIR)/%.d,$
all: $(NVIDIA_SETTINGS) doc/$(MANPAGE)
install: all
- $(STRIP) $(NVIDIA_SETTINGS)
$(INSTALL_RULE)
$(OBJS_DIR)/%.o: %.c
--- NEW FILE nvidia-settings.desktop ---
[Desktop Entry]
Name=nVidia Display Settings
Comment=Configure the nVidia driver
Exec=nvidia-settings
Terminal=false
Icon=nvidia-settings
Type=Application
Categories=System;
--- NEW FILE nvidia-settings.spec ---
# We use the driver version as a snapshot internal number
# The real version of the package remains 1.0
# This will prevent missunderstanding and versioning changes on the nvidia driver
%global nversion 190.42
#Possible replacement/complement:
#http://willem.engen.nl/projects/disper/
Name: nvidia-settings
Version: 1.0
Release: 3.2%{?dist}
Summary: Configure the NVIDIA graphics driver
Group: Applications/System
License: MIT
URL: ftp://download.nvidia.com/XFree86/nvidia-settings/
Source0: ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-%{nvers...
Source1: nvidia-settings.desktop
Patch0: nvidia-settings-1.0-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else 0%{?fedora} == 11
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
%endif
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
#BuildRequires: libXNVCtrl-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: libXv-devel
#Needed for FBConfig table
#BuildRequires: xorg-x11-drv-nvidia-devel
BuildRequires: mesa-libGL-devel
%description
The nvidia-settings utility is a tool for configuring the NVIDIA graphics
driver. It operates by communicating with the NVIDIA X driver, querying
and updating state as appropriate.
This communication is done with the NV-CONTROL X extension.
nvidia-settings is compatible with driver up to %{nversion}.
%prep
%setup -q
%patch0 -p1 -b .default
rm -rf src/libXNVCtrl/libXNVCtrl.a
sed -i -e 's|# CFLAGS = -Wall|CFLAGS = $(INIT_CFLAGS)|' Makefile
sed -i -e 's|# X11R6_DIR = /usr/X11R6|X11R6_DIR = %{_prefix}|' Makefile
sed -i -e 's|CFLAGS = -Wall -g|CFLAGS = $(RPM_OPT_FLAGS)|' src/XF86Config-parser/Makefile
%build
# no job control
make NVDEBUG=1 INIT_CFLAGS="$RPM_OPT_FLAGS -I/usr/include/nvidia -DX_XF86VidModeGetGammaRampSize"
%install
rm -rf $RPM_BUILD_ROOT
make install ROOT=$RPM_BUILD_ROOT INSTALL="install -p"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
# Desktop entry for nvidia-settings
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
%{SOURCE1}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc doc/*.txt
%{_bindir}/nvidia-settings
%{_datadir}/applications/*nvidia-settings.desktop
%{_mandir}/man1/nvidia-settings.1.gz
%changelog
* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-3.1
- Update internal to 190.42
* Thu Jul 15 2009 kwizart < kwizart at gmail.com > - 1.0-3
- Update internal to 185.18.14
* Tue Mar 3 2009 kwizart < kwizart at gmail.com > - 1.0-2.1
- Update internal to 180.35
* Tue Jun 17 2008 kwizart < kwizart at gmail.com > - 1.0-2
- Update to 173.14.09
- Remove the locale patch
* Wed May 28 2008 kwizart < kwizart at gmail.com > - 1.0-1
- First Package for Fedora.
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2009 14:10:14 -0000 1.1
+++ .cvsignore 22 Nov 2009 14:45:59 -0000 1.2
@@ -0,0 +1 @@
+nvidia-settings-190.42.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-settings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Nov 2009 14:10:14 -0000 1.1
+++ sources 22 Nov 2009 14:45:59 -0000 1.2
@@ -0,0 +1 @@
+eb0cbb9f57ecf0d5a4a4804b7e257b10 nvidia-settings-190.42.tar.gz
14 years, 5 months