Skip to content

Commit 82d77bc

Browse files
sergiomb2sergiomb2
committed
to verify
1 parent bb4beea commit 82d77bc

12 files changed

+941
-5
lines changed

‎License.txt

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Pinball source code
2+
~~~~~~~~~~~~~~~~~
3+
License for use and distribution
4+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5+
6+
Pinball Copyright (C) 2000-2016 by Henrik Enqvist
7+
8+
Licenses for files are:
9+
10+
1) Core license is GPLv2+
11+
2) gnu table licenses are (GFDL or Free Art or CC-BY-SA) and GPLv3 and
12+
CC-BY-SA (data/gnu/README)
13+
3) hurd table license is GPLv2+ (data/hurd/README.txt)
14+
4) professor table license is GPLv2+ (data/professor2/README.txt)
15+
16+
Full package could be License as GPLv2+ and (GFDL or Free Art or CC-BY-SA) and GPLv3 and CC-BY-SA
17+
18+
We have a review here: https://bugzilla.redhat.com/show_bug.cgi?id=1290935 if
19+
something is not correct please let us know to fix it..
20+
21+
22+
References:
23+
https://github.com/sergiomb2/pinball/pull/3#commitcomment-20063738
24+
25+
The core license is GPLv2+, not GPL+.
26+
I have released hurd and professor2 on the same license on purpose to avoid creating problems with versions of the GPL.
27+
28+
The gnu table can create problem with a next release of GPL (a hypothetical GPLv4).
29+
30+
however, the full package including gnu must be released under GPLv3.
31+
Or gnu should be kept separate.
32+
33+
It would be a good idea to contact Ben Asselstine for verify if it's possible to port gnu on GPLv3+.
34+
So the entire project can be GPLv3+.
35+
36+
in fact also https://sourceforge.net/projects/pinball/ says License: GNU General Public License version 2.0 (GPLv2)

‎addon/Menu.cpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ const char* MenuChoose::getText() {
167167
}
168168
}
169169

170+
const char* MenuChoose::getTextDisplay() {
171+
return MenuChoose::getText();
172+
}
173+
170174
void MenuChoose::addText(const char * text) {
171175
// TODO free these chars
172176
char * str = (char*) malloc((MAX_MENU_NAME+1)*sizeof(char));
@@ -205,9 +209,10 @@ int MenuChoose::prev() {
205209
/***************************************************************************
206210
* A menu that performs a function when choosen */
207211

208-
MenuFct::MenuFct(const char * name, int (*fct)(void), Engine* e)
212+
MenuFct::MenuFct(const char * name, const char* nameDisplay, int (*fct)(void), Engine* e)
209213
: MenuItem(e, EM_MENU_FCT) {
210214
strncpy(m_Name, name, MAX_MENU_NAME);
215+
strncpy(m_NameDisplay, nameDisplay, MAX_MENU_NAME);
211216
p_Fct = fct;
212217
}
213218

‎addon/Menu.h

+7-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class MenuItem {
3535
MenuItem(Engine* e, int type);
3636
virtual ~MenuItem();
3737
virtual const char* getText() = 0;
38+
virtual const char* getTextDisplay() = 0;
3839
virtual int perform() = 0;
3940
inline int getType() { return m_iType; };
4041
inline Engine * getEngine() { return p_Engine; };
@@ -58,6 +59,7 @@ class MenuSub : public MenuItem {
5859
inline int size() { return m_vMenuItem.size(); };
5960
inline void setAction(int a) { m_iAction = a; };
6061
inline const char* getText() { return m_Name; };
62+
inline const char* getTextDisplay() { return m_Name; };
6163
/** Add a text which is to appear under the name when the item is selected. TODO */
6264
void addInfoText(const char * text);
6365
/** Add a text which is to appear under the name when the item is selected */
@@ -77,6 +79,7 @@ class MenuChoose : public MenuItem {
7779
~MenuChoose();
7880
void addText(const char * text);
7981
const char* getText();
82+
const char* getTextDisplay();
8083
int perform();
8184
int next();
8285
int prev();
@@ -104,6 +107,7 @@ class MenuInput : public MenuItem
104107
int perform();
105108
void draw();
106109
inline const char* getText() { return m_Name; };
110+
inline const char* getTextDisplay() { return m_Name; };
107111
inline void setAction(int a) { m_iAction = a; };
108112
const char * getInput();
109113
protected:
@@ -117,12 +121,14 @@ class MenuInput : public MenuItem
117121
* The perform function should return EM_MENU_BACK, EM_MENU_NOP or EM_MENU_QUIT. */
118122
class MenuFct : public MenuItem {
119123
public:
120-
MenuFct(const char * name, int (*fct)(void), Engine* e);
124+
MenuFct(const char * name, const char* nameDisplay, int (*fct)(void), Engine* e);
121125
~MenuFct();
122126
int perform();
123127
virtual const char* getText() { return m_Name; };
128+
virtual const char* getTextDisplay() { return m_NameDisplay; };
124129
protected:
125130
char m_Name[MAX_MENU_NAME + 1];
131+
char m_NameDisplay[MAX_MENU_NAME + 1];
126132
int (*p_Fct)(void);
127133
};
128134

‎configure.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# !/bin/sh
2+
set -e
3+
./bootstrap $@
4+
./configure $@

‎debian/pinball.menu

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
?package(pinball):needs="X11" section="Games/Simulation"\
2+
title="Pinball" command="/usr/games/pinball"\
3+
icon="/usr/share/pixmaps/pinball.xpm"
4+
5+
?package(pinball):needs="vc" section="Games/Simulation"\
6+
title="Pinball" command="/usr/games/pinball"\
7+
icon="/usr/share/pixmaps/pinball.xpm"
8+

‎downstream/fedora/pinball.spec

+215
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,215 @@
1+
Name: pinball
2+
Version: 0.3.3.1
3+
Release: 1%{?dist}
4+
Summary: Emilia 3D Pinball Game
5+
# core license is GPL+
6+
# gnu table licenses are (GFDL or Free Art or CC-BY-SA) and GPLv3 and CC-BY-SA
7+
# hurd table license is GPLv2+
8+
License: GPL+ and (GFDL or Free Art or CC-BY-SA) and GPLv3 and CC-BY-SA and GPLv2+
9+
URL: http://pinball.sourceforge.net
10+
Source0: https://github.com/sergiomb2/pinball/archive/%{version}/%{name}-%{version}.tar.gz
11+
BuildRequires: libXt-devel freeglut-devel SDL_image-devel SDL_mixer-devel
12+
BuildRequires: libpng-devel libvorbis-devel libtool-ltdl-devel
13+
BuildRequires: desktop-file-utils libappstream-glib
14+
BuildRequires: autoconf automake libtool
15+
Requires: hicolor-icon-theme opengl-games-utils timidity++-patches
16+
17+
%description
18+
The Emilia Pinball project is an open source pinball simulator for linux
19+
and other unix systems. The current release features a number of tables:
20+
tux, professor, professor2, gnu and hurd and is very addictive.
21+
22+
%package devel
23+
Summary: Development files for %{name}
24+
Requires: %{name}%{?_isa} = %{version}-%{release}
25+
26+
%description devel
27+
This package contains files for development with %{name}.
28+
May be used in pinball-pinedit.
29+
30+
31+
%prep
32+
%setup -q
33+
sed -i 's/Exec=pinball/Exec=pinball-wrapper/' pinball.desktop
34+
./bootstrap
35+
36+
37+
%build
38+
%configure --disable-static
39+
%make_build
40+
41+
42+
%install
43+
%make_install INSTALL="install -p"
44+
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
45+
# remove unused global higescorefiles:
46+
#rm -r $RPM_BUILD_ROOT%{_localstatedir}
47+
# remove unused test module
48+
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libModuleTest.*
49+
# .la files are needed for ltdl
50+
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.a
51+
# remove bogus development files
52+
#rm $RPM_BUILD_ROOT%{_bindir}/%{name}-config
53+
#rm -r $RPM_BUILD_ROOT%{_includedir}/%{name}
54+
55+
# below is the desktop file and icon stuff.
56+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
57+
desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
58+
--set-key='Keywords' --set-value='Game;Arcade;Pinball;' \
59+
pinball.desktop
60+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
61+
install -p -m 644 pinball.png \
62+
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
63+
mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
64+
install -p -m 644 pinball.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
65+
appstream-util validate-relax --nonet \
66+
$RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
67+
68+
69+
%post
70+
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
71+
72+
%postun
73+
if [ $1 -eq 0 ] ; then
74+
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
75+
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
76+
fi
77+
78+
%posttrans
79+
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
80+
81+
82+
%files
83+
%doc README ChangeLog
84+
%license COPYING
85+
%{_bindir}/%{name}
86+
%{_bindir}/%{name}-wrapper
87+
%dir %{_libdir}/%{name}
88+
%{_libdir}/%{name}/*so.*
89+
%{_libdir}/%{name}/*la
90+
%{_datadir}/%{name}
91+
%{_datadir}/appdata/%{name}.appdata.xml
92+
%{_datadir}/applications/%{name}.desktop
93+
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
94+
95+
%files devel
96+
%{_bindir}/%{name}-config
97+
%{_libdir}/%{name}/*.so
98+
%{_includedir}/%{name}
99+
100+
101+
%changelog
102+
* Sat Nov 12 2016 Sérgio Basto <[email protected]> - 0.3.3.1-1
103+
- Test pinball-0.3.3.1
104+
105+
* Tue Jul 26 2016 Sérgio Basto <[email protected]> - 0.3.3-1
106+
- Update to 0.3.3
107+
108+
* Thu Feb 04 2016 Fedora Release Engineering <[email protected]> - 0.3.2-4
109+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
110+
111+
* Sat Jan 9 2016 Hans de Goede <[email protected]> - 0.3.2-3
112+
- Add Keywords field to desktop file
113+
114+
* Mon Dec 14 2015 Jon Ciesla <[email protected]> - 0.3.2-2
115+
- Fix license tag, BZ 1290935.
116+
117+
* Mon Oct 26 2015 Hans de Goede <[email protected]> - 0.3.2-1
118+
- Switch to new github upstream
119+
- Update to 0.3.2 release
120+
- Add an appdata file
121+
- Add Requires: timidity++-patches so that the music works
122+
123+
* Fri Aug 21 2015 Ralf Corsépius <[email protected]> - 0.3.1-27
124+
- Let configure honor CFLAGS (Add pinball-0.3.1-cflags.patch)
125+
(Fix F23FTBS, RHBZ#1239792).
126+
- Add %%license.
127+
- Modernize spec.
128+
129+
* Thu Jun 18 2015 Fedora Release Engineering <[email protected]> - 0.3.1-26
130+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
131+
132+
* Sun Aug 17 2014 Fedora Release Engineering <[email protected]> - 0.3.1-25
133+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
134+
135+
* Tue Jul 01 2014 Yaakov Selkowitz <[email protected]> - 0.3.1-24
136+
- Run autoreconf to fix FTBFS on aarch64 (#926341)
137+
138+
* Sat Jun 07 2014 Fedora Release Engineering <[email protected]> - 0.3.1-23
139+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
140+
141+
* Sun Aug 04 2013 Fedora Release Engineering <[email protected]> - 0.3.1-22
142+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
143+
144+
* Mon Feb 11 2013 Jon Ciesla <[email protected]> - 0.3.1-21
145+
- Drop desktop vendor tag.
146+
147+
* Sat Jul 21 2012 Fedora Release Engineering <[email protected]> - 0.3.1-20
148+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
149+
150+
* Tue Feb 28 2012 Fedora Release Engineering <[email protected]> - 0.3.1-19
151+
- Rebuilt for c++ ABI breakage
152+
153+
* Sat Jan 14 2012 Fedora Release Engineering <[email protected]> - 0.3.1-18
154+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
155+
156+
* Wed Feb 09 2011 Fedora Release Engineering <[email protected]> - 0.3.1-17
157+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
158+
159+
* Mon Nov 15 2010 Jon Ciesla <[email protected]> - 0.3.1-16
160+
- Fix FTBFS, BZ 631379.
161+
162+
* Sun Jul 26 2009 Fedora Release Engineering <[email protected]> - 0.3.1-15
163+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
164+
165+
* Mon Mar 02 2009 Jon Ciesla <[email protected]> - 0.3.1-14
166+
- Patch for strict prototypes.
167+
168+
* Thu Feb 26 2009 Fedora Release Engineering <[email protected]> - 0.3.1-13
169+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
170+
171+
* Mon Nov 24 2008 Jon Ciesla <[email protected]> - 0.3.1-12
172+
- Cleaned up summary.
173+
174+
* Tue Feb 19 2008 Fedora Release Engineering <[email protected]> - 0.3.1-11
175+
- Autorebuild for GCC 4.3
176+
177+
* Sun Oct 21 2007 Hans de Goede <[email protected]> 0.3.1-10
178+
- Drop the bogus -devel package (also fixing the multilib conficts caused by
179+
it, bz 342881)
180+
181+
* Mon Sep 24 2007 Hans de Goede <[email protected]> 0.3.1-9
182+
- Use opengl-games-utils wrapper to show error dialog when DRI is missing
183+
184+
* Wed Aug 15 2007 Hans de Goede <[email protected]> 0.3.1-8
185+
- Update License tag for new Licensing Guidelines compliance
186+
187+
* Sat Mar 10 2007 Hans de Goede <[email protected]> 0.3.1-7
188+
- Fixup .desktop file categories for games-menus usage
189+
190+
* Mon Aug 28 2006 Hans de Goede <[email protected]> 0.3.1-6
191+
- FE6 Rebuild
192+
193+
* Thu Aug 10 2006 Hans de Goede <[email protected]> 0.3.1-5
194+
- Add missing rm -rf $RPM_BUILD_ROOT to %%install
195+
196+
* Fri Aug 4 2006 Hans de Goede <[email protected]> 0.3.1-4
197+
- Make building use / honor $RPM_OPT_FLAGS
198+
- Add missing BR: libtool-ltdl-devel
199+
- Remove %%{?_smp_mflags} as that breaks building when actually set
200+
201+
* Thu Aug 3 2006 Hans de Goede <[email protected]> 0.3.1-3
202+
- Cleaned up specfile for Fedora Extras submission, based on Che's newrpms spec
203+
- Use system ltdl
204+
205+
* Sat Apr 05 2003 che
206+
- upgrade to version 0.2.0a
207+
208+
* Mon Mar 03 2003 Che
209+
- upgrade to version 0.1.3
210+
211+
* Mon Nov 04 2002 Che
212+
- upgrade to version 0.1.1
213+
214+
* Wed Oct 30 2002 Che
215+
- initial rpm release

0 commit comments

Comments
 (0)