rpms/amule/F-17 amule.spec,1.16,1.17
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/amule/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20092/F-17
Modified Files:
amule.spec
Log Message:
Add hardened build
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/F-17/amule.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amule.spec 13 May 2012 17:26:29 -0000 1.16
+++ amule.spec 13 May 2012 17:31:16 -0000 1.17
@@ -1,8 +1,9 @@
# TODO: setup firefox for ed2k links using triggers and a file in /usr/lib/firefox-3.0.1/defaults/preferences/
+%global _hardened_build 1
Name: amule
Version: 2.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Group: Applications/Internet
@@ -170,7 +171,8 @@
%changelog
-* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-1
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-2
+- Add hardened build
- Fix build with gcc47
* Mon Jan 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-0
12 years, 4 months
rpms/amule/F-16 aMule-2.3.1-gcc47.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 amule.spec, 1.14, 1.15 sources, 1.7, 1.8 aMule-2.1.3-gcc43.patch, 1.1, NONE aMule-2.1.3-multiple.patch, 1.1, NONE aMule-2.1.3-ocreate.patch, 1.1, NONE aMule-2.2.3-gcc44.patch, 1.1, NONE aMule-2.2.6-fix_FTBFS.patch, 1.1, NONE aMule-wx-1.2.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/amule/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19850/F-16
Modified Files:
.cvsignore amule.spec sources
Added Files:
aMule-2.3.1-gcc47.patch
Removed Files:
aMule-2.1.3-gcc43.patch aMule-2.1.3-multiple.patch
aMule-2.1.3-ocreate.patch aMule-2.2.3-gcc44.patch
aMule-2.2.6-fix_FTBFS.patch aMule-wx-1.2.patch
Log Message:
Fix build with gcc47
aMule-2.3.1-gcc47.patch:
ObservableQueue.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE aMule-2.3.1-gcc47.patch ---
diff -up aMule-2.3.1/src/ObservableQueue.h.gcc47 aMule-2.3.1/src/ObservableQueue.h
--- aMule-2.3.1/src/ObservableQueue.h.gcc47 2011-06-13 10:50:25.000000000 +0200
+++ aMule-2.3.1/src/ObservableQueue.h 2012-05-13 19:20:12.019301155 +0200
@@ -331,14 +331,14 @@ CObservableQueue<ValueType>::~CObservabl
template <typename ValueType>
void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STARTING ), o );
+ this->NotifyObservers( EventType( EventType::STARTING ), o );
}
template <typename ValueType>
void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STOPPING ), o );
+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
}
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/amule/F-16/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 20 Sep 2009 15:30:58 -0000 1.7
+++ .cvsignore 13 May 2012 17:26:59 -0000 1.8
@@ -1 +1 @@
-aMule-2.2.6.tar.bz2
+aMule-2.3.1.tar.xz
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/F-16/amule.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- amule.spec 26 Sep 2011 22:13:21 -0000 1.14
+++ amule.spec 13 May 2012 17:27:00 -0000 1.15
@@ -1,13 +1,13 @@
# TODO: setup firefox for ed2k links using triggers and a file in /usr/lib/firefox-3.0.1/defaults/preferences/
Name: amule
-Version: 2.2.6
-Release: 4%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: File sharing client compatible with eDonkey
License: GPLv2+
Group: Applications/Internet
-Source0: http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.bz2
-Patch0: aMule-2.2.6-fix_FTBFS.patch
+Source0: http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.xz
+Patch0: aMule-2.3.1-gcc47.patch
URL: http://amule.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# See http://www.amule.org/wiki/index.php/Requirements
@@ -49,7 +49,7 @@
%prep
%setup -q -n aMule-%{version}
-%patch0 -p1 -b .new
+%patch0 -p1 -b .gcc47
manfiles=`find . -name "*.1"`
for manfile in $manfiles; do
iconv -f ISO-8859-1 -t UTF-8 < $manfile > $manfile.utf8
@@ -61,15 +61,16 @@
%configure \
--disable-rpath \
--disable-debug \
+ --docdir=%{_datadir}/doc/%{name}-%{version} \
--enable-wxcas \
--enable-cas \
--enable-alc \
--enable-alcc \
+ --enable-xas \
--enable-amule-daemon \
--enable-amulecmd \
--enable-webserver \
--enable-amule-daemon \
- --enable-utf8-systray \
--enable-geoip \
--enable-ccache \
--enable-amule-gui \
@@ -118,7 +119,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc %{_datadir}/doc/aMule-%{version}
+%doc ABOUT-NLS
%{_bindir}/alc
%{_bindir}/amule
%{_bindir}/cas
@@ -169,8 +170,11 @@
%changelog
-* Tue Sep 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-4
-- Rebuilt for libupnp
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-1
+- Fix build with gcc47
+
+* Mon Jan 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-0
+- Update to 2.3.1
* Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-3
- Fix FTBFS and gcc compiler bug
Index: sources
===================================================================
RCS file: /cvs/free/rpms/amule/F-16/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 20 Sep 2009 15:30:58 -0000 1.7
+++ sources 13 May 2012 17:27:00 -0000 1.8
@@ -1 +1 @@
-530d9b48187e36f78fc21bb19e94326d aMule-2.2.6.tar.bz2
+5f5707ad2073d37100409870aa5d3f93 aMule-2.3.1.tar.xz
--- aMule-2.1.3-gcc43.patch DELETED ---
--- aMule-2.1.3-multiple.patch DELETED ---
--- aMule-2.1.3-ocreate.patch DELETED ---
--- aMule-2.2.3-gcc44.patch DELETED ---
--- aMule-2.2.6-fix_FTBFS.patch DELETED ---
--- aMule-wx-1.2.patch DELETED ---
12 years, 4 months
rpms/amule/F-17 aMule-2.3.1-gcc47.patch, NONE, 1.1 amule.spec, 1.15, 1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/amule/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19527/F-17
Modified Files:
amule.spec
Added Files:
aMule-2.3.1-gcc47.patch
Log Message:
Fix build with gcc47
aMule-2.3.1-gcc47.patch:
ObservableQueue.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE aMule-2.3.1-gcc47.patch ---
diff -up aMule-2.3.1/src/ObservableQueue.h.gcc47 aMule-2.3.1/src/ObservableQueue.h
--- aMule-2.3.1/src/ObservableQueue.h.gcc47 2011-06-13 10:50:25.000000000 +0200
+++ aMule-2.3.1/src/ObservableQueue.h 2012-05-13 19:20:12.019301155 +0200
@@ -331,14 +331,14 @@ CObservableQueue<ValueType>::~CObservabl
template <typename ValueType>
void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STARTING ), o );
+ this->NotifyObservers( EventType( EventType::STARTING ), o );
}
template <typename ValueType>
void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STOPPING ), o );
+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
}
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/F-17/amule.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- amule.spec 4 May 2012 19:57:01 -0000 1.15
+++ amule.spec 13 May 2012 17:26:29 -0000 1.16
@@ -7,6 +7,7 @@
License: GPLv2+
Group: Applications/Internet
Source0: http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.xz
+Patch0: aMule-2.3.1-gcc47.patch
URL: http://amule.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# See http://www.amule.org/wiki/index.php/Requirements
@@ -48,6 +49,7 @@
%prep
%setup -q -n aMule-%{version}
+%patch0 -p1 -b .gcc47
manfiles=`find . -name "*.1"`
for manfile in $manfiles; do
iconv -f ISO-8859-1 -t UTF-8 < $manfile > $manfile.utf8
@@ -168,7 +170,10 @@
%changelog
-* Mon Jan 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-1
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-1
+- Fix build with gcc47
+
+* Mon Jan 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-0
- Update to 2.3.1
* Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-3
12 years, 4 months
rpms/amule/devel aMule-2.3.1-gcc47.patch, NONE, 1.1 amule.spec, 1.15, 1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/amule/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19344/devel
Modified Files:
amule.spec
Added Files:
aMule-2.3.1-gcc47.patch
Log Message:
Fix build with gcc47
aMule-2.3.1-gcc47.patch:
ObservableQueue.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE aMule-2.3.1-gcc47.patch ---
diff -up aMule-2.3.1/src/ObservableQueue.h.gcc47 aMule-2.3.1/src/ObservableQueue.h
--- aMule-2.3.1/src/ObservableQueue.h.gcc47 2011-06-13 10:50:25.000000000 +0200
+++ aMule-2.3.1/src/ObservableQueue.h 2012-05-13 19:20:12.019301155 +0200
@@ -331,14 +331,14 @@ CObservableQueue<ValueType>::~CObservabl
template <typename ValueType>
void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STARTING ), o );
+ this->NotifyObservers( EventType( EventType::STARTING ), o );
}
template <typename ValueType>
void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
{
- NotifyObservers( EventType( EventType::STOPPING ), o );
+ this->NotifyObservers( EventType( EventType::STOPPING ), o );
}
Index: amule.spec
===================================================================
RCS file: /cvs/free/rpms/amule/devel/amule.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- amule.spec 4 May 2012 19:56:23 -0000 1.15
+++ amule.spec 13 May 2012 17:26:04 -0000 1.16
@@ -7,6 +7,7 @@
License: GPLv2+
Group: Applications/Internet
Source0: http://dl.sourceforge.net/%{name}/aMule-%{version}.tar.xz
+Patch0: aMule-2.3.1-gcc47.patch
URL: http://amule.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# See http://www.amule.org/wiki/index.php/Requirements
@@ -48,6 +49,7 @@
%prep
%setup -q -n aMule-%{version}
+%patch0 -p1 -b .gcc47
manfiles=`find . -name "*.1"`
for manfile in $manfiles; do
iconv -f ISO-8859-1 -t UTF-8 < $manfile > $manfile.utf8
@@ -168,7 +170,10 @@
%changelog
-* Mon Jan 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-1
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-1
+- Fix build with gcc47
+
+* Mon Jan 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-0
- Update to 2.3.1
* Thu Oct 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.6-3
12 years, 4 months
rpms/xroar/F-16 xroar-0.28-lm.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xroar.spec, 1.10, 1.11 xroar-0.27-lm.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/xroar/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18505
Modified Files:
.cvsignore sources xroar.spec
Added Files:
xroar-0.28-lm.patch
Removed Files:
xroar-0.27-lm.patch
Log Message:
* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
- Upgrade to 0.28
- Use converted macosx icons
xroar-0.28-lm.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xroar-0.28-lm.patch ---
diff -durN xroar-0.28/Makefile xroar-0.28-lm/Makefile
--- xroar-0.28/Makefile 2012-05-12 09:01:33.000000000 +0200
+++ xroar-0.28-lm/Makefile 2012-05-13 10:44:42.265766639 +0200
@@ -335,7 +335,7 @@
-I$(CURDIR) -I$(SRCROOT) $(WARN) \
-DVERSION=\"$(VERSION)\" \
-DROMPATH=$(ROMPATH) -DCONFPATH=$(CONFPATH)
-xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS)
+xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS) -lm
portalib_CFLAGS = $(CFLAGS) $(CPPFLAGS) \
-I$(CURDIR) -I$(SRCROOT) $(WARN)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xroar/F-16/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 1 Oct 2011 13:27:50 -0000 1.8
+++ .cvsignore 13 May 2012 16:54:13 -0000 1.9
@@ -1,2 +1,2 @@
-xroar-0.27.tar.gz
+xroar-0.28.tar.gz
dragon.rom
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xroar/F-16/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 1 Oct 2011 13:27:50 -0000 1.8
+++ sources 13 May 2012 16:54:13 -0000 1.9
@@ -1,2 +1,2 @@
-b1143058297fc44b1348d5b9d82b0c5f xroar-0.27.tar.gz
+0cdc25986ed4e3352fba42bf4c6d99cb xroar-0.28.tar.gz
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
Index: xroar.spec
===================================================================
RCS file: /cvs/free/rpms/xroar/F-16/xroar.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xroar.spec 2 Oct 2011 15:55:05 -0000 1.10
+++ xroar.spec 13 May 2012 16:54:13 -0000 1.11
@@ -1,6 +1,6 @@
Name: xroar
-Version: 0.27
-Release: 2%{?dist}
+Version: 0.28
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
Group: Applications/Emulators
License: GPLv2+
@@ -8,7 +8,7 @@
Source0: http://www.6809.org.uk/dragon/%{name}-%{version}.tar.gz
Source1: http://www.6809.org.uk/dragon/dragon.rom
# Hans de Goede
-Patch0: %{name}-0.27-lm.patch
+Patch0: %{name}-0.28-lm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -17,7 +17,7 @@
BuildRequires: pulseaudio-libs-devel
BuildRequires: texinfo
BuildRequires: texinfo-tex
-BuildRequires: ImageMagick
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires(post): info
@@ -48,9 +48,6 @@
make doc/xroar.html
make doc/xroar.pdf
-# Create icon
-convert gp32/icon.bmp -transparent '#000000' %{name}.png
-
# Generate desktop file
cat >%{name}.desktop <<EOF
[Desktop Entry]
@@ -82,11 +79,20 @@
make install DEB_BUILD_OPTIONS=nostrip \
DESTDIR=%{buildroot}
-# Install ROM and icon
-mkdir -p %{buildroot}%{_datadir}/{%{name}/roms,icons/hicolor/32x32/apps}
-install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+# Install ROM
+mkdir -p %{buildroot}%{_datadir}/%{name}/roms
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/roms/dragon-minifirm.rom
+# Extract Mac OS X icons
+icns2png -x macosx/%{name}.icns
+
+# Install icons
+for i in 16 32 48 128; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 %{name}_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
+
# Install desktop files
desktop-file-install \
--vendor dribble \
@@ -130,7 +136,7 @@
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/applications/dribble-%{name}-minifirm.desktop
%{_infodir}/%{name}.info*
@@ -139,6 +145,13 @@
%changelog
+* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
+- Upgrade to 0.28
+- Use converted macosx icons
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.27-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Sun Oct 01 2011 Andrea Musuruane <musuruan(a)gmail.com> 0.27-2
- Fix FTBFS for F16+ with a patch by Hans de Goede
--- xroar-0.27-lm.patch DELETED ---
12 years, 4 months
rpms/xroar/F-17 xroar-0.28-lm.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xroar.spec, 1.11, 1.12 xroar-0.27-lm.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/xroar/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18340
Modified Files:
.cvsignore sources xroar.spec
Added Files:
xroar-0.28-lm.patch
Removed Files:
xroar-0.27-lm.patch
Log Message:
* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
- Upgrade to 0.28
- Use converted macosx icons
xroar-0.28-lm.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xroar-0.28-lm.patch ---
diff -durN xroar-0.28/Makefile xroar-0.28-lm/Makefile
--- xroar-0.28/Makefile 2012-05-12 09:01:33.000000000 +0200
+++ xroar-0.28-lm/Makefile 2012-05-13 10:44:42.265766639 +0200
@@ -335,7 +335,7 @@
-I$(CURDIR) -I$(SRCROOT) $(WARN) \
-DVERSION=\"$(VERSION)\" \
-DROMPATH=$(ROMPATH) -DCONFPATH=$(CONFPATH)
-xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS)
+xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS) -lm
portalib_CFLAGS = $(CFLAGS) $(CPPFLAGS) \
-I$(CURDIR) -I$(SRCROOT) $(WARN)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xroar/F-17/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 1 Oct 2011 13:27:50 -0000 1.8
+++ .cvsignore 13 May 2012 16:53:36 -0000 1.9
@@ -1,2 +1,2 @@
-xroar-0.27.tar.gz
+xroar-0.28.tar.gz
dragon.rom
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xroar/F-17/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 1 Oct 2011 13:27:50 -0000 1.8
+++ sources 13 May 2012 16:53:37 -0000 1.9
@@ -1,2 +1,2 @@
-b1143058297fc44b1348d5b9d82b0c5f xroar-0.27.tar.gz
+0cdc25986ed4e3352fba42bf4c6d99cb xroar-0.28.tar.gz
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
Index: xroar.spec
===================================================================
RCS file: /cvs/free/rpms/xroar/F-17/xroar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xroar.spec 8 Feb 2012 22:12:28 -0000 1.11
+++ xroar.spec 13 May 2012 16:53:38 -0000 1.12
@@ -1,6 +1,6 @@
Name: xroar
-Version: 0.27
-Release: 3%{?dist}
+Version: 0.28
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
Group: Applications/Emulators
License: GPLv2+
@@ -8,7 +8,7 @@
Source0: http://www.6809.org.uk/dragon/%{name}-%{version}.tar.gz
Source1: http://www.6809.org.uk/dragon/dragon.rom
# Hans de Goede
-Patch0: %{name}-0.27-lm.patch
+Patch0: %{name}-0.28-lm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -17,7 +17,7 @@
BuildRequires: pulseaudio-libs-devel
BuildRequires: texinfo
BuildRequires: texinfo-tex
-BuildRequires: ImageMagick
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires(post): info
@@ -48,9 +48,6 @@
make doc/xroar.html
make doc/xroar.pdf
-# Create icon
-convert gp32/icon.bmp -transparent '#000000' %{name}.png
-
# Generate desktop file
cat >%{name}.desktop <<EOF
[Desktop Entry]
@@ -82,11 +79,20 @@
make install DEB_BUILD_OPTIONS=nostrip \
DESTDIR=%{buildroot}
-# Install ROM and icon
-mkdir -p %{buildroot}%{_datadir}/{%{name}/roms,icons/hicolor/32x32/apps}
-install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+# Install ROM
+mkdir -p %{buildroot}%{_datadir}/%{name}/roms
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/roms/dragon-minifirm.rom
+# Extract Mac OS X icons
+icns2png -x macosx/%{name}.icns
+
+# Install icons
+for i in 16 32 48 128; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 %{name}_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
+
# Install desktop files
desktop-file-install \
--vendor dribble \
@@ -130,7 +136,7 @@
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/applications/dribble-%{name}-minifirm.desktop
%{_infodir}/%{name}.info*
@@ -139,6 +145,10 @@
%changelog
+* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
+- Upgrade to 0.28
+- Use converted macosx icons
+
* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--- xroar-0.27-lm.patch DELETED ---
12 years, 4 months
rpms/xroar/devel xroar-0.28-lm.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 xroar.spec, 1.11, 1.12 xroar-0.27-lm.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/xroar/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18200
Modified Files:
.cvsignore sources xroar.spec
Added Files:
xroar-0.28-lm.patch
Removed Files:
xroar-0.27-lm.patch
Log Message:
* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
- Upgrade to 0.28
- Use converted macosx icons
xroar-0.28-lm.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE xroar-0.28-lm.patch ---
diff -durN xroar-0.28/Makefile xroar-0.28-lm/Makefile
--- xroar-0.28/Makefile 2012-05-12 09:01:33.000000000 +0200
+++ xroar-0.28-lm/Makefile 2012-05-13 10:44:42.265766639 +0200
@@ -335,7 +335,7 @@
-I$(CURDIR) -I$(SRCROOT) $(WARN) \
-DVERSION=\"$(VERSION)\" \
-DROMPATH=$(ROMPATH) -DCONFPATH=$(CONFPATH)
-xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS)
+xroar_unix_LDFLAGS = $(LDFLAGS) $(LDLIBS) $(xroar_opt_LDFLAGS) -lm
portalib_CFLAGS = $(CFLAGS) $(CPPFLAGS) \
-I$(CURDIR) -I$(SRCROOT) $(WARN)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 1 Oct 2011 13:27:50 -0000 1.8
+++ .cvsignore 13 May 2012 16:52:59 -0000 1.9
@@ -1,2 +1,2 @@
-xroar-0.27.tar.gz
+xroar-0.28.tar.gz
dragon.rom
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 1 Oct 2011 13:27:50 -0000 1.8
+++ sources 13 May 2012 16:52:59 -0000 1.9
@@ -1,2 +1,2 @@
-b1143058297fc44b1348d5b9d82b0c5f xroar-0.27.tar.gz
+0cdc25986ed4e3352fba42bf4c6d99cb xroar-0.28.tar.gz
f8b5f52c07abb4dc9102d8420605d7e4 dragon.rom
Index: xroar.spec
===================================================================
RCS file: /cvs/free/rpms/xroar/devel/xroar.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xroar.spec 8 Feb 2012 22:12:28 -0000 1.11
+++ xroar.spec 13 May 2012 16:52:59 -0000 1.12
@@ -1,6 +1,6 @@
Name: xroar
-Version: 0.27
-Release: 3%{?dist}
+Version: 0.28
+Release: 1%{?dist}
Summary: A Dragon 32, Dragon 64 and Tandy CoCo emulator
Group: Applications/Emulators
License: GPLv2+
@@ -8,7 +8,7 @@
Source0: http://www.6809.org.uk/dragon/%{name}-%{version}.tar.gz
Source1: http://www.6809.org.uk/dragon/dragon.rom
# Hans de Goede
-Patch0: %{name}-0.27-lm.patch
+Patch0: %{name}-0.28-lm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: gtkglext-devel
@@ -17,7 +17,7 @@
BuildRequires: pulseaudio-libs-devel
BuildRequires: texinfo
BuildRequires: texinfo-tex
-BuildRequires: ImageMagick
+BuildRequires: libicns-utils
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires(post): info
@@ -48,9 +48,6 @@
make doc/xroar.html
make doc/xroar.pdf
-# Create icon
-convert gp32/icon.bmp -transparent '#000000' %{name}.png
-
# Generate desktop file
cat >%{name}.desktop <<EOF
[Desktop Entry]
@@ -82,11 +79,20 @@
make install DEB_BUILD_OPTIONS=nostrip \
DESTDIR=%{buildroot}
-# Install ROM and icon
-mkdir -p %{buildroot}%{_datadir}/{%{name}/roms,icons/hicolor/32x32/apps}
-install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
+# Install ROM
+mkdir -p %{buildroot}%{_datadir}/%{name}/roms
install -pm0644 %{SOURCE1} %{buildroot}%{_datadir}/%{name}/roms/dragon-minifirm.rom
+# Extract Mac OS X icons
+icns2png -x macosx/%{name}.icns
+
+# Install icons
+for i in 16 32 48 128; do
+ install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+ install -m 644 %{name}_${i}x${i}x32.png \
+ %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png
+done
+
# Install desktop files
desktop-file-install \
--vendor dribble \
@@ -130,7 +136,7 @@
%defattr(-,root,root,-)
%{_bindir}/%{name}
%{_datadir}/%{name}
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/applications/dribble-%{name}.desktop
%{_datadir}/applications/dribble-%{name}-minifirm.desktop
%{_infodir}/%{name}.info*
@@ -139,6 +145,10 @@
%changelog
+* Sun May 13 2012 Andrea Musuruane <musuruan(a)gmail.com> 0.28-1
+- Upgrade to 0.28
+- Use converted macosx icons
+
* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
--- xroar-0.27-lm.patch DELETED ---
12 years, 4 months
rpms/wl-kmod/F-17 wl-kmod.spec,1.68,1.69
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15917
Modified Files:
wl-kmod.spec
Log Message:
* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.10
- Rebuilt for release kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- wl-kmod.spec 9 May 2012 06:28:21 -0000 1.68
+++ wl-kmod.spec 13 May 2012 15:28:21 -0000 1.69
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
Name: wl-kmod
Version: 5.100.82.112
-Release: 2%{?dist}.9
+Release: 2%{?dist}.10
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -83,6 +83,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.10
+- Rebuilt for release kernel
+
* Wed May 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.9
- rebuild for updated kernel
12 years, 4 months
rpms/nvidia-kmod/F-17 nvidia-kmod.spec,1.109,1.110
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15796
Modified Files:
nvidia-kmod.spec
Log Message:
* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.49-1.4
- Rebuilt for release kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-17/nvidia-kmod.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- nvidia-kmod.spec 9 May 2012 06:28:10 -0000 1.109
+++ nvidia-kmod.spec 13 May 2012 15:28:12 -0000 1.110
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 295.49
# Taken over by kmodtool
-Release: 1%{?dist}.3
+Release: 1%{?dist}.4
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -77,6 +77,9 @@
%changelog
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.49-1.4
+- Rebuilt for release kernel
+
* Wed May 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.49-1.3
- rebuild for updated kernel
12 years, 4 months
rpms/catalyst-kmod/F-17 catalyst-kmod.spec,1.22,1.23
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/catalyst-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15664
Modified Files:
catalyst-kmod.spec
Log Message:
* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-1.10
- Rebuilt for release kernel
Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-17/catalyst-kmod.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- catalyst-kmod.spec 9 May 2012 06:27:59 -0000 1.22
+++ catalyst-kmod.spec 13 May 2012 15:27:12 -0000 1.23
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+%define buildforkernels current
# Tweak to have debuginfo - part 1/2
%if 0%{?fedora} > 7
@@ -13,7 +13,7 @@
Name: catalyst-kmod
Version: 11.11
-Release: 1%{?dist}.9
+Release: 1%{?dist}.10
# Taken over by kmodtool
Summary: AMD display driver kernel module
Group: System Environment/Kernel
@@ -97,6 +97,9 @@
%changelog
+* Sun May 13 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-1.10
+- Rebuilt for release kernel
+
* Wed May 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.11-1.9
- rebuild for updated kernel
12 years, 4 months