rpms/ultrastardx/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 ultrastardx-snapshot.sh, 1.1, 1.2 ultrastardx.spec, 1.9, 1.10 ultrastardx-ffmpeg-headers.patch, 1.1, NONE
by Felix Kaechele
Author: felix
Update of /cvs/free/rpms/ultrastardx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20725
Modified Files:
.cvsignore sources ultrastardx-snapshot.sh ultrastardx.spec
Removed Files:
ultrastardx-ffmpeg-headers.patch
Log Message:
* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-2.9.r2052
- new snapshot
- now builds on F12 again
- improved specfile
- improved ultrastardx-snapshot.sh
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Jul 2009 21:14:27 -0000 1.5
+++ .cvsignore 21 Dec 2009 21:17:15 -0000 1.6
@@ -1 +1 @@
-ultrastardx-20090719.tar.lzma
+ultrastardx-r2052.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 19 Jul 2009 21:14:27 -0000 1.5
+++ sources 21 Dec 2009 21:17:15 -0000 1.6
@@ -1 +1 @@
-5fda615d86e759581ff5d2c3fdbb9933 ultrastardx-20090719.tar.lzma
+f181bdb984f4d386dd5cb3f51f892ae2 ultrastardx-r2052.tar.xz
Index: ultrastardx-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/devel/ultrastardx-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ultrastardx-snapshot.sh 3 Mar 2009 22:15:05 -0000 1.1
+++ ultrastardx-snapshot.sh 21 Dec 2009 21:17:15 -0000 1.2
@@ -12,22 +12,23 @@
unset CDPATH
pwd=$(pwd)
-svn=$(date +%Y%m%d)
+
cd "$tmp"
+svnpath=https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk
+svn=`svn info $svnpath | grep Revision | awk '{print $2}'`
-svn checkout -r {$svn} https://ultrastardx.svn.sourceforge.net/svnroot/ultrastardx/trunk ultrastardx-$svn
+svn export $svnpath ultrastardx-r$svn
-cd ultrastardx-$svn
-find . -type d -name .svn -print0 | xargs -0r rm -rf
+cd ultrastardx-r$svn
# remove installer stuff as it's not needed for linux
rm -rf installer*
# remove precompiled stuff
find . -name *.res -exec rm -rf {} \;
# remove fonts, fedora has it's own
-find game/fonts/ -name *.ttf -exec rm -rf {} \;
+rm -rf game/fonts/DejaVu game/fonts/FreeSans
cd ..
-tar --lzma -cf "$pwd"/ultrastardx-$svn.tar.lzma ultrastardx-$svn
+tar --xz -cf "$pwd"/ultrastardx-r$svn.tar.xz ultrastardx-r$svn
cd - >/dev/null
Index: ultrastardx.spec
===================================================================
RCS file: /cvs/free/rpms/ultrastardx/devel/ultrastardx.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrastardx.spec 21 Oct 2009 13:31:40 -0000 1.9
+++ ultrastardx.spec 21 Dec 2009 21:17:15 -0000 1.10
@@ -1,22 +1,24 @@
-%define prever 20090719
+%define prever r2052
Name: ultrastardx
Version: 1.1.1
-Release: 2%{?prever:.8.%{prever}}%{?dist}
+Release: 2%{?prever:.9.%{prever}}%{?dist}
Summary: Karaoke game inspired by a popular commercial karaoke game
Group: Amusements/Games
License: GPLv2+
URL: http://www.ultrastardeluxe.org
# Source0: svn snapshot; use supplied ultrastardx-snapshot.sh to get one
-Source0: ultrastardx%{?prever:-%{prever}}.tar.lzma
-Source1: ultrastardx-32x32.png
-Source2: ultrastardx-256x256.png
-Source100: ultrastardx-snapshot.sh
-Patch0: ultrastardx-desktop.patch
+Source0: %{name}%{?prever:-%{prever}}.tar.xz
+Source1: %{name}-32x32.png
+Source2: %{name}-256x256.png
+Source100: %{name}-snapshot.sh
+Patch0: %{name}-desktop.patch
+# This changes the font path to Liberation fonts
+Patch1: %{name}-fonts.ini-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: bitstream-vera-sans-fonts gnu-free-sans-fonts
+Requires: liberation-sans-fonts
BuildRequires: fpc desktop-file-utils
BuildRequires: ffmpeg-devel freetype-devel libpng-devel libprojectM-devel
@@ -32,20 +34,12 @@
%prep
%setup -q -n %{name}%{?prever:-%{prever}}
%patch0 -p1
-
-# replace the font paths with Fedora's own
-sed -i 's|File=|File=%{_datadir}/fonts/|g' game/fonts/fontsTTF.ini
-sed -i 's|FreeSans|freefont/FreeSans|g' game/fonts/fontsTTF.ini
-sed -i 's|Vera|bitstream-vera/Vera|g' game/fonts/fontsTTF.ini
+%patch1 -p1
iconv -f iso-8859-1 -t utf-8 ChangeLog.GERMAN.txt > ChangeLog.GERMAN.txt.utf-8
touch -r ChangeLog.GERMAN.txt ChangeLog.GERMAN.txt.utf-8
mv ChangeLog.GERMAN.txt.utf-8 ChangeLog.GERMAN.txt
-tr -d \\r < COPYRIGHT.txt > COPYRIGHT.txt.unix
-touch -r COPYRIGHT.txt COPYRIGHT.txt.unix
-mv COPYRIGHT.txt.unix COPYRIGHT.txt
-
%build
%configure --with-libprojectM=nocheck libprojectM_VERSION=$(pkg-config --modversion libprojectM) libprojectM_INCLUDEDIR="/usr/include" libprojectM_DATADIR="/usr/share/projectM"
make %{?_smp_mflags} PFLAGS_EXTRA="-fPIC"
@@ -62,6 +56,8 @@
install -Dpm 644 %{SOURCE2} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
+# only used for UTF-8 unaware systems
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/languages/convert.sh
%clean
rm -rf $RPM_BUILD_ROOT
@@ -84,7 +80,7 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS.txt ChangeLog.GERMAN.txt ChangeLog.txt COPYING.txt COPYRIGHT.txt
-%doc README.txt
+%doc README.txt RELEASEBLOCKERS.txt
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
@@ -92,6 +88,12 @@
%changelog
+* Mon Dec 21 2009 Felix Kaechele <heffer(a)fedoraproject.org> - 1.1.1-2.9.r2052
+- new snapshot
+- now builds on F12 again
+- improved specfile
+- improved ultrastardx-snapshot.sh
+
* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.1.1-2.8.20090719
- rebuild for new ffmpeg
--- ultrastardx-ffmpeg-headers.patch DELETED ---
14 years, 4 months
rpms/audacious-plugins-freeworld/devel audacious-ffaudio.desktop, NONE, 1.1 audacious-plugins-2.2-m4a.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 audacious-aac.desktop, 1.1, 1.2 audacious-mp3.desktop, 1.1, 1.2 audacious-plugins-freeworld.spec, 1.5, 1.6 sources, 1.4, 1.5 audacious-alac.desktop, 1.1, NONE audacious-wma.desktop, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26265
Modified Files:
.cvsignore audacious-aac.desktop audacious-mp3.desktop
audacious-plugins-freeworld.spec sources
Added Files:
audacious-ffaudio.desktop audacious-plugins-2.2-m4a.patch
Removed Files:
audacious-alac.desktop audacious-wma.desktop
Log Message:
* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-1
- Update to 2.2
--- NEW FILE audacious-ffaudio.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play music
Comment[hu]=Zene lejátszása
Exec=audacious
Icon=audacious.png
MimeType=audio/x-ms-wma;audio/alac;audio/x-musepack;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true
audacious-plugins-2.2-m4a.patch:
ffaudio-core.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE audacious-plugins-2.2-m4a.patch ---
diff -up audacious-plugins-2.2/src/ffaudio/ffaudio-core.c~ audacious-plugins-2.2/src/ffaudio/ffaudio-core.c
--- audacious-plugins-2.2/src/ffaudio/ffaudio-core.c~ 2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2/src/ffaudio/ffaudio-core.c 2009-12-19 15:15:03.000000000 +0100
@@ -664,6 +664,9 @@ static gchar *ffaudio_fmts[] = {
/* VQF */
"vqf",
+ /* Apple Lossless (alac) */
+ "m4a",
+
/* end of table */
NULL
};
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 21 Aug 2009 14:45:57 -0000 1.4
+++ .cvsignore 19 Dec 2009 15:59:56 -0000 1.5
@@ -1 +1 @@
-audacious-plugins-2.1.tgz
+audacious-plugins-2.2.tgz
Index: audacious-aac.desktop
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-aac.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-aac.desktop 10 Aug 2008 10:54:05 -0000 1.1
+++ audacious-aac.desktop 19 Dec 2009 15:59:56 -0000 1.2
@@ -8,6 +8,4 @@
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.10
NoDisplay=true
Index: audacious-mp3.desktop
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-mp3.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-mp3.desktop 10 Aug 2008 10:54:05 -0000 1.1
+++ audacious-mp3.desktop 19 Dec 2009 15:59:56 -0000 1.2
@@ -8,6 +8,4 @@
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.10
NoDisplay=true
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- audacious-plugins-freeworld.spec 21 Aug 2009 14:45:57 -0000 1.5
+++ audacious-plugins-freeworld.spec 19 Dec 2009 15:59:56 -0000 1.6
@@ -1,7 +1,12 @@
-%define aud_ver 2.1
+# TODO:
+# - add more mime types to .desktop file for 'ffaudio' plugin
+# - add BR sidplay2-devel and find a way to make the built sid.so
+# plugin an alternative to Fedora's sidplay1 based sid.so
+
+%define aud_ver 2.2
Name: audacious-plugins-freeworld
-Version: 2.1
+Version: 2.2
Release: 1%{?dist}
Summary: Additional plugins for the Audacious media player
@@ -11,8 +16,8 @@
Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
Source1: audacious-mp3.desktop
Source2: audacious-aac.desktop
-Source3: audacious-wma.desktop
-Source4: audacious-alac.desktop
+Source3: audacious-ffaudio.desktop
+Patch0: audacious-plugins-2.2-m4a.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: audacious-devel >= %{aud_ver}
@@ -21,14 +26,14 @@
BuildRequires: lame-devel, libmms-devel, libmad-devel
BuildRequires: gettext, libbinio-devel
BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
+# ffaudio plugin
+BuildRequires: faad2-devel ffmpeg-devel
# require all the plugins
Requires: %{name}-mp3 = %{version}-%{release}
Requires: %{name}-aac = %{version}-%{release}
-Requires: %{name}-wma = %{version}-%{release}
-Requires: %{name}-alac = %{version}-%{release}
-Requires: %{name}-tta = %{version}-%{release}
Requires: %{name}-mms = %{version}-%{release}
+Requires: %{name}-ffaudio = %{version}-%{release}
# obsolete old freshrpms package
Provides: audacious-plugins-extras = %{version}-%{release}
@@ -39,6 +44,9 @@
user interface based on Winamp 2.x skins. It is based on ("forked off")
BMP.
+This package contains additional plugins for the Audacious media player.
+
+
%package mp3
Summary: MP3 playback plugin for Audacious
Group: Applications/Multimedia
@@ -47,9 +55,6 @@
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
-Provides: bmp-mp3 = 0.9.7.1
-Obsoletes: bmp-mp3 <= 0.9.7.1
-
# obsolete old livna package
Provides: audacious-plugins-nonfree-mp3 = %{version}-%{release}
Obsoletes: audacious-plugins-nonfree-mp3 < %{version}-%{release}
@@ -82,60 +87,26 @@
This is the plugin needed to play AAC audio files.
-%package wma
-Summary: WMA playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
+%package ffaudio
+Summary: FFMpeg/FAAD2 based input plugin for Audacious
+Group: Applications/Multimedia
+Requires: audacious-plugins >= %{aud_ver}
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-wma = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release}
+# obsolete discontinued plugins
+Obsoletes: audacious-plugins-freeworld-alac <= 2.1
+Obsoletes: audacious-plugins-freeworld-tta <= 2.1
+Obsoletes: audacious-plugins-freeworld-wma <= 2.1
+
+# obsolete old livna packages
+Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release}
-%description wma
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-BMP.
-
-This is the plugin needed to play WMA audio files.
-
-
-%package alac
-Summary: ALAC playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
-
-Requires(post): desktop-file-utils >= 0.9
-Requires(postun): desktop-file-utils >= 0.9
-
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-alac = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release}
-
-%description alac
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-
-This is the plugin needed to play ALAC (Apple Lossless Audio Codec)
-audio files.
-
-
-%package tta
-Summary: TTA playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
-
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-tta = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release}
-
-%description tta
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-
-This is the plugin needed to play TTA audio files.
+%description ffaudio
+FFMpeg/FAAD2 based input plugin for Audacious.
%package mms
@@ -157,6 +128,8 @@
%prep
%setup -q -n audacious-plugins-%{version}
+%patch0 -p1
+sed -i '\,^.SILENT:,d' buildsys.mk.in
%build
@@ -168,9 +141,7 @@
--disable-dependency-tracking
make V=1 %{?_smp_mflags} -C src/madplug
make V=1 %{?_smp_mflags} -C src/aac
-make V=1 %{?_smp_mflags} -C src/wma
-make V=1 %{?_smp_mflags} -C src/alac
-make V=1 %{?_smp_mflags} -C src/tta
+make V=1 %{?_smp_mflags} -C src/ffaudio
make V=1 %{?_smp_mflags} -C src/mms
@@ -178,9 +149,7 @@
rm -rf $RPM_BUILD_ROOT
make -C src/madplug install DESTDIR=$RPM_BUILD_ROOT
make -C src/aac install DESTDIR=$RPM_BUILD_ROOT
-make -C src/wma install DESTDIR=$RPM_BUILD_ROOT
-make -C src/alac install DESTDIR=$RPM_BUILD_ROOT
-make -C src/tta install DESTDIR=$RPM_BUILD_ROOT
+make -C src/ffaudio install DESTDIR=$RPM_BUILD_ROOT
make -C src/mms install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor livna \
@@ -191,16 +160,13 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
-desktop-file-install --vendor livna \
+desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE3}
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE4}
-
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -217,16 +183,10 @@
%postun aac
update-desktop-database %{_datadir}/applications
-%post wma
-update-desktop-database %{_datadir}/applications
-
-%postun wma
-update-desktop-database %{_datadir}/applications
-
-%post alac
+%post ffaudio
update-desktop-database %{_datadir}/applications
-%postun alac
+%postun ffaudio
update-desktop-database %{_datadir}/applications
@@ -244,25 +204,20 @@
%{_libdir}/audacious/Input/aac.so
%{_datadir}/applications/livna-audacious-aac.desktop
-%files wma
+%files ffaudio
%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wma.so
-%{_datadir}/applications/livna-audacious-wma.desktop
-
-%files alac
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/alac.so
-%{_datadir}/applications/livna-audacious-alac.desktop
-
-%files tta
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/tta.so
+%{_libdir}/audacious/Input/ffaudio.so
+%{_datadir}/applications/audacious-ffaudio.desktop
%files mms
%defattr(-,root,root,-)
%{_libdir}/audacious/Transport/mms.so
+
%changelog
+* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-1
+- Update to 2.2
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.5.1-2
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 21 Aug 2009 14:45:57 -0000 1.4
+++ sources 19 Dec 2009 15:59:56 -0000 1.5
@@ -1 +1 @@
-087fcb1f6fb8429b267f18ed3e3acb7a audacious-plugins-2.1.tgz
+ed6790bf5667c824eda72301f0a886a8 audacious-plugins-2.2.tgz
--- audacious-alac.desktop DELETED ---
--- audacious-wma.desktop DELETED ---
14 years, 4 months
rpms/gstreamer-plugins-bad/devel gstreamer-plugins-bad.spec, 1.31, 1.32
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11804
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-3
- Disable muscbrainz / trm plugin (#1001)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gstreamer-plugins-bad.spec 4 Dec 2009 12:11:18 -0000 1.31
+++ gstreamer-plugins-bad.spec 19 Dec 2009 12:43:32 -0000 1.32
@@ -7,7 +7,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.17
-Release: 2%{?dist}
+Release: 3%{?dist}
# The freeze and nfs plugins are LGPLv2 (only)
License: LGPLv2+ and LGPLv2
Group: Applications/Multimedia
@@ -41,7 +41,6 @@
BuildRequires: mesa-libGLU-devel
BuildRequires: neon-devel
BuildRequires: libmms-devel
-BuildRequires: libmusicbrainz-devel
BuildRequires: libcdaudio-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: mjpegtools-devel
@@ -132,6 +131,7 @@
# Disable selector, mpegdemux and schroedinger, they are patched into Fedora
# Disable amrwb (enc), faac and vdpau as they do not belong in rpmfusion-free
# Disable farsight plugins, they are patched into Fedora's packages
+# Disable musicbrainz plugin, the musicbrainz servers are decommissioned
%configure \
--with-package-name="gst-plugins-bad rpmfusion rpm" \
--with-package-origin="http://rpmfusion.org/" \
@@ -139,7 +139,8 @@
--disable-mpegdemux --disable-selector --disable-schro \
--disable-amrwb --disable-faac --disable-vdpau \
--disable-valve --disable-dtmf --disable-autoconvert \
- --disable-liveadder --disable-rtpmux
+ --disable-liveadder --disable-rtpmux \
+ --disable-musicbrainz
# Don't use rpath!
%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -258,7 +259,6 @@
%{_libdir}/gstreamer-%{majorminor}/libgstsdl.so
%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
#%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so
-%{_libdir}/gstreamer-%{majorminor}/libgsttrm.so
%{_libdir}/gstreamer-%{majorminor}/libgstxvid.so
%{_libdir}/gstreamer-%{majorminor}/libgstzbar.so
%{_libdir}/gstreamer-%{majorminor}/libresindvd.so
@@ -294,6 +294,9 @@
%changelog
+* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-3
+- Disable muscbrainz / trm plugin (#1001)
+
* Fri Dec 4 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.17-2
- Enable LADSPA plugins (#992)
14 years, 4 months
rpms/k3b-extras-freeworld/devel .cvsignore, 1.4, 1.5 k3b-extras-freeworld.spec, 1.12, 1.13 sources, 1.4, 1.5 k3b-1.0.5-ffmpeg.patch, 1.4, NONE k3b-lavc52.patch, 1.3, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/k3b-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24597
Modified Files:
.cvsignore k3b-extras-freeworld.spec sources
Removed Files:
k3b-1.0.5-ffmpeg.patch k3b-lavc52.patch
Log Message:
* Fri Dec 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.69.0-1
- k3b-1.69.0 (alpha4)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 1 Oct 2009 13:34:36 -0000 1.4
+++ .cvsignore 18 Dec 2009 20:57:11 -0000 1.5
@@ -1 +1 @@
-k3b-1.0.5.tar.bz2
+k3b-1.69.0alpha4.tar.bz2
Index: k3b-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/k3b-extras-freeworld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- k3b-extras-freeworld.spec 3 Oct 2009 23:11:22 -0000 1.12
+++ k3b-extras-freeworld.spec 18 Dec 2009 20:57:11 -0000 1.13
@@ -1,46 +1,41 @@
-%define kdelibs3 kdelibs
-%if 0%{?fedora} > 6
-%define kdelibs3 kdelibs3
-%define ffmpeg ffmpeg
-%define _with_ffmpeg --with-ffmpeg
-%endif
-
-Name: k3b-extras-freeworld
-Epoch: 1
-Version: 1.0.5
-Release: 7%{?dist}
-Summary: Additional codec plugins for the k3b CD/DVD burning application
-
-Group: Applications/Multimedia
-License: GPLv2+
-URL: http://www.k3b.org
-Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-
-## upstreamable
-Patch50: k3b-1.0.5-ffmpeg.patch
+%define pre alpha4
-## upstream
-Patch100: k3b-lavc52.patch
+Name: k3b-extras-freeworld
+Summary: Additional codec plugins for the k3b CD/DVD burning application
+Epoch: 1
+Version: 1.69.0
+Release: 1%{?dist}
+
+Group: Applications/Archiving
+License: GPLv2+
+URL: http://www.k3b.org/
+Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar...
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# TODO: bugzilla/document
+ExcludeArch: s390 s390x
+
+## upstreamable patches
+
+BuildRequires: cmake
+BuildRequires: flac-devel
+BuildRequires: gettext
+BuildRequires: kdelibs4-devel
+BuildRequires: kdemultimedia-devel
+BuildRequires: libdvdread-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libmusicbrainz-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+# needed by k3bsetup
+#BuildRequires: polkit-qt-devel
+BuildRequires: taglib-devel
-ExcludeArch: s390 s390x
-
-BuildRequires: %{kdelibs3}-devel
+BuildRequires: ffmpeg-devel
BuildRequires: lame-devel
BuildRequires: libdvdread-devel
BuildRequires: libmad-devel
-%{?ffmpeg:BuildRequires: %{ffmpeg}-devel automake libtool}
-BuildRequires: libmusicbrainz-devel
-BuildRequires: gettext
-BuildRequires: taglib-devel
-
-Obsoletes: k3b-mp3 < 0.12.10
-Provides: k3b-mp3 = %{version}-%{release}
-
-# livna upgrade
-Obsoletes: k3b-extras-nonfree < 1.0.4-3
-Provides: k3b-extras-nonfree = %{version}-%{release}
Requires: k3b >= %{version}
@@ -50,88 +45,61 @@
handle CD/DVD burning application.
+
%prep
%setup -q -n k3b-%{version}
-%if 0%{?ffmpeg:1}
-%patch50 -p1 -b .ffmpeg
-%patch100 -p1 -b .lavc52
-
-# hack/fix for newer automake
-sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-
-make -f admin/Makefile.common
-%endif
-
%build
-unset QTDIR
-[ -z "$QTDIR" ] && . /etc/profile.d/qt.sh
-%configure \
- --disable-rpath \
- --enable-new-ldflags \
- --disable-debug --disable-warnings \
- --disable-dependency-tracking --enable-final \
- --with-libdvdread \
- --with-external-libsamplerate=no \
- --without-oggvorbis \
- --without-flac \
- --without-sndfile \
- --without-hal \
- --without-musepack \
- --with-k3bsetup=no \
- %{?_with_ffmpeg} %{!?_with_ffmpeg:--without-ffmpeg} \
- --with-lame \
- --with-libmad
-
-%global makeflags %{?_smp_mflags}%{nil}
-
-# We need just a few k3b core libs.
-# As FC k3b package no longer includes the libtool archives,
-# we cannot simply link them anymore.
-pushd libk3bdevice
-#ln -s %{_libdir}/libk3bdevice.la libk3bdevice.la
-make %makeflags
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+ ..
popd
-pushd libk3b
-#ln -s %{_libdir}/libk3b.la libk3b.la
-make %makeflags
-popd
+#make %{?_smp_mflags} -C %{_target_platform}/libk3bdevice
+#make %{?_smp_mflags} -C %{_target_platform}/libk3b
+make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/ffmpeg
+make %{?_smp_mflags} -C %{_target_platform}/plugins/decoder/mp3
+make %{?_smp_mflags} -C %{_target_platform}/plugins/encoder/lame
-# Now build individual plugins.
-make %makeflags -C plugins/decoder/mp3
-%{?ffmpeg:make %makeflags -C plugins/decoder/ffmpeg}
-make %makeflags -C plugins/encoder/lame
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/mp3
-%{?ffmpeg:make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/ffmpeg}
-make install DESTDIR=$RPM_BUILD_ROOT -C plugins/encoder/lame
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/ffmpeg
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/decoder/mp3
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/plugins/encoder/lame
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-%files
+%files
%defattr(-,root,root,-)
-%{?ffmpeg:%{_libdir}/kde3/libk3bffmpegdecoder.*}
-%{?ffmpeg:%{_datadir}/apps/k3b/plugins/k3bffmpegdecoder.plugin}
-%{_libdir}/kde3/libk3blameencoder.*
-%{_datadir}/apps/k3b/plugins/k3blameencoder.plugin
-%{_libdir}/kde3/libk3bmaddecoder.*
-%{_datadir}/apps/k3b/plugins/k3bmaddecoder.plugin
+%{_kde4_libdir}/kde4/k3bffmpegdecoder.so
+%{_kde4_libdir}/kde4/k3blameencoder.so
+%{_kde4_libdir}/kde4/k3bmaddecoder.so
+%{_kde4_libdir}/kde4/kcm_k3blameencoder.so
+%{_kde4_datadir}/kde4/services/k3bffmpegdecoder.desktop
+%{_kde4_datadir}/kde4/services/k3blameencoder.desktop
+%{_kde4_datadir}/kde4/services/k3bmaddecoder.desktop
+%{_kde4_datadir}/kde4/services/kcm_k3blameencoder.desktop
%changelog
+* Fri Dec 18 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.69.0-1
+- k3b-1.69.0 (alpha4)
+
* Thu Oct 01 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1:1.0.5-7
- Epoch: 1 (F-12 revert to k3b-1.0.5)
+* Wed Jun 17 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 1.66.0-0.1.alpha2
+- k3b-1.66.0
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0.5-6
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/k3b-extras-freeworld/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 1 Oct 2009 13:34:36 -0000 1.4
+++ sources 18 Dec 2009 20:57:11 -0000 1.5
@@ -1 +1 @@
-e3b37d0d009af3dd149215d6ae0d54f3 k3b-1.0.5.tar.bz2
+8e7c15565c806cb028e11764f8781b97 k3b-1.69.0alpha4.tar.bz2
--- k3b-1.0.5-ffmpeg.patch DELETED ---
--- k3b-lavc52.patch DELETED ---
14 years, 4 months
rpms/ec2-api-tools/devel ec2-api-tools.spec, 1.2, 1.3 sources, 1.2, 1.3
by Lubomir Rintel
Author: lkundrak
Update of /cvs/nonfree/rpms/ec2-api-tools/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20705
Modified Files:
ec2-api-tools.spec sources
Log Message:
* Fri Dec 18 2009 Lubomir Rintel (GoodData) <lubo.rintel(a)gooddata.com> - 1.3.46266-1
- Update to 46266
Index: ec2-api-tools.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ec2-api-tools/devel/ec2-api-tools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ec2-api-tools.spec 2 Aug 2009 15:25:57 -0000 1.2
+++ ec2-api-tools.spec 18 Dec 2009 14:42:43 -0000 1.3
@@ -1,5 +1,5 @@
%global major_version 1.3
-%global minor_version 36506
+%global minor_version 46266
Name: ec2-api-tools
Version: %{major_version}.%{minor_version}
@@ -72,6 +72,9 @@
%changelog
+* Fri Dec 18 2009 Lubomir Rintel (GoodData) <lubo.rintel(a)gooddata.com> - 1.3.46266-1
+- Update to 46266
+
* Wed Jul 15 2009 Lubomir Rintel (Good Data) <lubo.rintel(a)gooddata.com> - 1.3.36506-1
- Bump to newer upstream version
- Publising, remove profanity
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/ec2-api-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 2 Aug 2009 15:24:12 -0000 1.2
+++ sources 18 Dec 2009 14:42:43 -0000 1.3
@@ -1 +1 @@
-3d8758b85e05e83f938941afe9068d3f ec2-api-tools.zip
+075b511e07575927c39ca6478b283597 ec2-api-tools.zip
14 years, 4 months
rpms/cairo-dock/F-12 cairo-dock-plugins-2.1.2.4-showDesklets.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 cairo-dock.spec, 1.40, 1.41 sources, 1.33, 1.34 cairo-dock-2.0.0-dock-rendering-compile.patch, 1.1, NONE cairo-dock-rev1816-dnd2share.patch, 1.1, NONE cairo-dock-rev1821-cairodock.patch, 1.1, NONE cairo-dock-rev1823-cairodock.patch, 1.1, NONE
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3896/F-12
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-plugins-2.1.2.4-showDesklets.patch
Removed Files:
cairo-dock-2.0.0-dock-rendering-compile.patch
cairo-dock-rev1816-dnd2share.patch
cairo-dock-rev1821-cairodock.patch
cairo-dock-rev1823-cairodock.patch
Log Message:
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
- 2.1.2-4
cairo-dock-plugins-2.1.2.4-showDesklets.patch:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cairo-dock-plugins-2.1.2.4-showDesklets.patch ---
=== modified file 'configure.ac'
--- configure.ac 2009-12-05 13:29:23 +0000
+++ configure.ac 2009-12-17 18:54:04 +0000
@@ -124,7 +124,7 @@
[ --enable-rssreader : Enable rssreader applet (default=no) ],
[ with_rssreader=${enableval} ],
[ with_rssreader=no ])
-AC_ARG_ENABLE(,
+AC_ARG_ENABLE(show-desklets,
[ --enable-show-desklets : Enable showDesklets applet (default=no) ],
[ with_showDesklets=${enableval} ],
[ with_showDesklets=no ])
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 5 Nov 2009 15:49:12 -0000 1.31
+++ .cvsignore 17 Dec 2009 20:53:01 -0000 1.32
@@ -1,2 +1,3 @@
-cairo-dock-2.1.1-2.tar.gz
-cairo-dock-plugins-2.1.1-2.tar.gz
+cairo-dock-2.1.2-4.tar.gz
+cairo-dock-plugins-2.1.2-4.tar.gz
+cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/cairo-dock.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cairo-dock.spec 5 Nov 2009 16:03:00 -0000 1.40
+++ cairo-dock.spec 17 Dec 2009 20:53:01 -0000 1.41
@@ -1,10 +1,15 @@
# NOTE!
# Now for weblet plug-ins now cairo-dock uses WebKit, not Gecko.
-# For svn
-# svn checkout http://svn.berlios.de/svnroot/repos/cairo-dock/trunk
-# cd trunk
-# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
+# Now upstream VCS uses bazaar
+# To gain the source codes from upstream VCS, use
+# $ bzr branch <URL>
+# , where the current URL is:
+#
+# For core:
+# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/2.1.x/
+# For plug-ins:
+# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.1.x/
%global released 1
%undefine pre_release
@@ -12,9 +17,9 @@
%global build_other 1
%global urlver 2.1
-%global mainver 2.1.1
+%global mainver 2.1.2
%undefine betaver
-%global postver 2
+%global postver 4
%global build_webkit 1
%global build_xfce 1
@@ -43,15 +48,20 @@
Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}/+download/cairo...
Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}/+download/c...
%endif
+# Temporarily
+# pulled from plug-ins 2.1.x branch rev 1449
+Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
+Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch
-%if ! %{released}
+# For patch101
+#%%if ! %{released}
BuildRequires: automake
BuildRequires: libtool
-%endif
+#%%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: intltool
@@ -167,6 +177,13 @@
%endif
###
+###
+# Temporarily
+cd plug-ins
+gzip -dc %{SOURCE10} | tar xf -
+cd ..
+###
+
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -212,6 +229,9 @@
# source code fix
+# showDesklets
+%patch101 -p0 -b .miss
+
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -224,7 +244,7 @@
# First deal with subdirs in configure.ac of topdir, then else
-if [ -f Makefile.am ] ; then
+if [[ -f Makefile.am && (0%{?released} -lt 1) ]] ; then
Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$(a)p' Makefile.am | sed -e 's|\\$||' | tail -n +2)
%{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
@@ -241,6 +261,12 @@
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
+## Patch101 needs autotools
+## Call here
+autoreconf -fi
+##
+##
+
for dir in */
do
skip=0
@@ -311,7 +337,9 @@
%configure \
--enable-gio-in-gmenu \
--enable-network-monitor \
+ --enable-rssreader \
--enable-scooby-do \
+ --enable-show-desklets
# Workaround to avoid endless loop on po/
@@ -568,6 +596,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
+- 2.1.2-4
+
* Sat Nov 6 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.1.2-1
- 2.1.1-2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 5 Nov 2009 15:49:13 -0000 1.33
+++ sources 17 Dec 2009 20:53:01 -0000 1.34
@@ -1,2 +1,3 @@
-30cf9238ddfa502d1a0274a7bd6027fa cairo-dock-2.1.1-2.tar.gz
-cf59f3b5afc11c78894317ba83c4f39d cairo-dock-plugins-2.1.1-2.tar.gz
+23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz
+920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz
+04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
--- cairo-dock-2.0.0-dock-rendering-compile.patch DELETED ---
--- cairo-dock-rev1816-dnd2share.patch DELETED ---
--- cairo-dock-rev1821-cairodock.patch DELETED ---
--- cairo-dock-rev1823-cairodock.patch DELETED ---
14 years, 4 months
rpms/cairo-dock/F-11 cairo-dock-plugins-2.1.2.4-showDesklets.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 cairo-dock.spec, 1.31, 1.32 sources, 1.25, 1.26 cairo-dock-2.0.0-dock-rendering-compile.patch, 1.1, NONE
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3896/F-11
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-plugins-2.1.2.4-showDesklets.patch
Removed Files:
cairo-dock-2.0.0-dock-rendering-compile.patch
Log Message:
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
- 2.1.2-4
cairo-dock-plugins-2.1.2.4-showDesklets.patch:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cairo-dock-plugins-2.1.2.4-showDesklets.patch ---
=== modified file 'configure.ac'
--- configure.ac 2009-12-05 13:29:23 +0000
+++ configure.ac 2009-12-17 18:54:04 +0000
@@ -124,7 +124,7 @@
[ --enable-rssreader : Enable rssreader applet (default=no) ],
[ with_rssreader=${enableval} ],
[ with_rssreader=no ])
-AC_ARG_ENABLE(,
+AC_ARG_ENABLE(show-desklets,
[ --enable-show-desklets : Enable showDesklets applet (default=no) ],
[ with_showDesklets=${enableval} ],
[ with_showDesklets=no ])
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 5 Nov 2009 16:34:37 -0000 1.23
+++ .cvsignore 17 Dec 2009 20:53:00 -0000 1.24
@@ -1,2 +1,3 @@
-cairo-dock-2.1.1-2.tar.gz
-cairo-dock-plugins-2.1.1-2.tar.gz
+cairo-dock-2.1.2-4.tar.gz
+cairo-dock-plugins-2.1.2-4.tar.gz
+cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cairo-dock.spec 5 Nov 2009 16:34:37 -0000 1.31
+++ cairo-dock.spec 17 Dec 2009 20:53:00 -0000 1.32
@@ -1,10 +1,15 @@
# NOTE!
# Now for weblet plug-ins now cairo-dock uses WebKit, not Gecko.
-# For svn
-# svn checkout http://svn.berlios.de/svnroot/repos/cairo-dock/trunk
-# cd trunk
-# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
+# Now upstream VCS uses bazaar
+# To gain the source codes from upstream VCS, use
+# $ bzr branch <URL>
+# , where the current URL is:
+#
+# For core:
+# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/2.1.x/
+# For plug-ins:
+# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.1.x/
%global released 1
%undefine pre_release
@@ -12,9 +17,9 @@
%global build_other 1
%global urlver 2.1
-%global mainver 2.1.1
+%global mainver 2.1.2
%undefine betaver
-%global postver 2
+%global postver 4
%global build_webkit 1
%global build_xfce 1
@@ -43,15 +48,20 @@
Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}/+download/cairo...
Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}/+download/c...
%endif
+# Temporarily
+# pulled from plug-ins 2.1.x branch rev 1449
+Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
+Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch
-%if ! %{released}
+# For patch101
+#%%if ! %{released}
BuildRequires: automake
BuildRequires: libtool
-%endif
+#%%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: intltool
@@ -167,6 +177,13 @@
%endif
###
+###
+# Temporarily
+cd plug-ins
+gzip -dc %{SOURCE10} | tar xf -
+cd ..
+###
+
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -212,6 +229,9 @@
# source code fix
+# showDesklets
+%patch101 -p0 -b .miss
+
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -224,7 +244,7 @@
# First deal with subdirs in configure.ac of topdir, then else
-if [ -f Makefile.am ] ; then
+if [[ -f Makefile.am && (0%{?released} -lt 1) ]] ; then
Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$(a)p' Makefile.am | sed -e 's|\\$||' | tail -n +2)
%{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
@@ -241,6 +261,12 @@
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
+## Patch101 needs autotools
+## Call here
+autoreconf -fi
+##
+##
+
for dir in */
do
skip=0
@@ -311,7 +337,9 @@
%configure \
--enable-gio-in-gmenu \
--enable-network-monitor \
+ --enable-rssreader \
--enable-scooby-do \
+ --enable-show-desklets
# Workaround to avoid endless loop on po/
@@ -568,6 +596,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
+- 2.1.2-4
+
* Sat Nov 6 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.1.2-1
- 2.1.1-2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 5 Nov 2009 16:34:37 -0000 1.25
+++ sources 17 Dec 2009 20:53:00 -0000 1.26
@@ -1,2 +1,3 @@
-30cf9238ddfa502d1a0274a7bd6027fa cairo-dock-2.1.1-2.tar.gz
-cf59f3b5afc11c78894317ba83c4f39d cairo-dock-plugins-2.1.1-2.tar.gz
+23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz
+920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz
+04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
--- cairo-dock-2.0.0-dock-rendering-compile.patch DELETED ---
14 years, 4 months
rpms/cairo-dock/devel cairo-dock-plugins-2.1.2.4-showDesklets.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 cairo-dock.spec, 1.40, 1.41 sources, 1.33, 1.34 cairo-dock-2.0.0-dock-rendering-compile.patch, 1.1, NONE cairo-dock-rev1816-dnd2share.patch, 1.1, NONE cairo-dock-rev1821-cairodock.patch, 1.1, NONE cairo-dock-rev1823-cairodock.patch, 1.1, NONE
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3896/devel
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-plugins-2.1.2.4-showDesklets.patch
Removed Files:
cairo-dock-2.0.0-dock-rendering-compile.patch
cairo-dock-rev1816-dnd2share.patch
cairo-dock-rev1821-cairodock.patch
cairo-dock-rev1823-cairodock.patch
Log Message:
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
- 2.1.2-4
cairo-dock-plugins-2.1.2.4-showDesklets.patch:
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE cairo-dock-plugins-2.1.2.4-showDesklets.patch ---
=== modified file 'configure.ac'
--- configure.ac 2009-12-05 13:29:23 +0000
+++ configure.ac 2009-12-17 18:54:04 +0000
@@ -124,7 +124,7 @@
[ --enable-rssreader : Enable rssreader applet (default=no) ],
[ with_rssreader=${enableval} ],
[ with_rssreader=no ])
-AC_ARG_ENABLE(,
+AC_ARG_ENABLE(show-desklets,
[ --enable-show-desklets : Enable showDesklets applet (default=no) ],
[ with_showDesklets=${enableval} ],
[ with_showDesklets=no ])
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 5 Nov 2009 15:49:12 -0000 1.31
+++ .cvsignore 17 Dec 2009 20:53:01 -0000 1.32
@@ -1,2 +1,3 @@
-cairo-dock-2.1.1-2.tar.gz
-cairo-dock-plugins-2.1.1-2.tar.gz
+cairo-dock-2.1.2-4.tar.gz
+cairo-dock-plugins-2.1.2-4.tar.gz
+cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cairo-dock.spec 5 Nov 2009 16:03:00 -0000 1.40
+++ cairo-dock.spec 17 Dec 2009 20:53:01 -0000 1.41
@@ -1,10 +1,15 @@
# NOTE!
# Now for weblet plug-ins now cairo-dock uses WebKit, not Gecko.
-# For svn
-# svn checkout http://svn.berlios.de/svnroot/repos/cairo-dock/trunk
-# cd trunk
-# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
+# Now upstream VCS uses bazaar
+# To gain the source codes from upstream VCS, use
+# $ bzr branch <URL>
+# , where the current URL is:
+#
+# For core:
+# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/2.1.x/
+# For plug-ins:
+# http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/2.1.x/
%global released 1
%undefine pre_release
@@ -12,9 +17,9 @@
%global build_other 1
%global urlver 2.1
-%global mainver 2.1.1
+%global mainver 2.1.2
%undefine betaver
-%global postver 2
+%global postver 4
%global build_webkit 1
%global build_xfce 1
@@ -43,15 +48,20 @@
Source0: http://launchpad.net/cairo-dock-core/%{urlver}/%{mainver}/+download/cairo...
Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}/+download/c...
%endif
+# Temporarily
+# pulled from plug-ins 2.1.x branch rev 1449
+Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
+Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch
-%if ! %{released}
+# For patch101
+#%%if ! %{released}
BuildRequires: automake
BuildRequires: libtool
-%endif
+#%%endif
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: intltool
@@ -167,6 +177,13 @@
%endif
###
+###
+# Temporarily
+cd plug-ins
+gzip -dc %{SOURCE10} | tar xf -
+cd ..
+###
+
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -212,6 +229,9 @@
# source code fix
+# showDesklets
+%patch101 -p0 -b .miss
+
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -224,7 +244,7 @@
# First deal with subdirs in configure.ac of topdir, then else
-if [ -f Makefile.am ] ; then
+if [[ -f Makefile.am && (0%{?released} -lt 1) ]] ; then
Subdirs_1=$(%{__sed} -n -e '\@SUBDIR@,\@^.*[^\\]$(a)p' Makefile.am | sed -e 's|\\$||' | tail -n +2)
%{__sed} -n -e '\@_dir=@p' Makefile.am > eval.sh
@@ -241,6 +261,12 @@
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
+## Patch101 needs autotools
+## Call here
+autoreconf -fi
+##
+##
+
for dir in */
do
skip=0
@@ -311,7 +337,9 @@
%configure \
--enable-gio-in-gmenu \
--enable-network-monitor \
+ --enable-rssreader \
--enable-scooby-do \
+ --enable-show-desklets
# Workaround to avoid endless loop on po/
@@ -568,6 +596,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
+- 2.1.2-4
+
* Sat Nov 6 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.1.2-1
- 2.1.1-2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 5 Nov 2009 15:49:13 -0000 1.33
+++ sources 17 Dec 2009 20:53:01 -0000 1.34
@@ -1,2 +1,3 @@
-30cf9238ddfa502d1a0274a7bd6027fa cairo-dock-2.1.1-2.tar.gz
-cf59f3b5afc11c78894317ba83c4f39d cairo-dock-plugins-2.1.1-2.tar.gz
+23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz
+920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz
+04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
--- cairo-dock-2.0.0-dock-rendering-compile.patch DELETED ---
--- cairo-dock-rev1816-dnd2share.patch DELETED ---
--- cairo-dock-rev1821-cairodock.patch DELETED ---
--- cairo-dock-rev1823-cairodock.patch DELETED ---
14 years, 4 months
rpms/freetype-freeworld/devel freetype-freeworld.spec, 1.7, 1.8 99-DejaVu-autohinter-only.conf, 1.1, NONE
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3963/devel
Modified Files:
freetype-freeworld.spec
Removed Files:
99-DejaVu-autohinter-only.conf
Log Message:
* Wed Dec 16 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.11-2
- Drop conditionals, always build the bytecode interpreter (now also in Fedora)
and subpixel rendering (as that's the only reason to build freetype-freeworld
at all)
- Drop 99-DejaVu-autohinter-only.conf
(These changes are for devel only, I'm intentionally NOT making them in F-12.)
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/devel/freetype-freeworld.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freetype-freeworld.spec 16 Dec 2009 23:50:49 -0000 1.7
+++ freetype-freeworld.spec 16 Dec 2009 23:57:35 -0000 1.8
@@ -1,19 +1,13 @@
-# Enable patented bytecode interpreter and patented subpixel rendering.
-# Setting to 1 disables them.
-%define without_bytecode_interpreter 0
-%define without_subpixel_rendering 0
-
%{!?with_xfree86:%define with_xfree86 1}
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.3.11
-Release: 1%{?dist}
+Release: 2%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
-Source1: 99-DejaVu-autohinter-only.conf
Patch20: freetype-2.1.10-enable-ft2-bci.patch
Patch21: freetype-2.3.0-enable-spr.patch
@@ -23,12 +17,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
-%if !0%{?without_bytecode_interpreter}
Provides: freetype-bytecode
-%endif
-%if !0%{?without_subpixel_rendering}
Provides: freetype-subpixel
-%endif
Requires: /etc/ld.so.conf.d
BuildRequires: libX11-devel
@@ -41,36 +31,15 @@
individual glyphs. FreeType is not a font server or a complete
text-rendering library.
-This version is compiled with the patented bytecode interpreter and subpixel
-rendering enabled. It transparently overrides the system library using
-ld.so.conf.d.
-
-
-%package devel
-Summary: FreeType development libraries and header files
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: zlib-devel
-Requires: pkgconfig
-
-%description devel
-The freetype-devel package includes the static libraries and header files
-for the FreeType font rendering engine.
-
-Install freetype-devel if you want to develop programs which will use
-FreeType.
+This version is compiled with the patented subpixel rendering enabled. It
+transparently overrides the system library using ld.so.conf.d.
%prep
%setup -q -n freetype-%{version}
-%if ! %{without_bytecode_interpreter}
%patch20 -p1 -b .enable-ft2-bci
-%endif
-
-%if ! %{without_subpixel_rendering}
%patch21 -p1 -b .enable-spr
-%endif
%patch46 -p1 -b .enable-valid
@@ -103,10 +72,6 @@
echo "%{_libdir}/%{name}" \
>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-# Disable BCI for DejaVu and Vera because it changes the font weight
-install -D -p -m 0755 %{SOURCE1} \
- $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d/99-DejaVu-autohinter-only.conf
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -119,9 +84,14 @@
%{_libdir}/%{name}
%doc ChangeLog README docs/LICENSE.TXT docs/FTL.TXT docs/GPL.TXT
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
-%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
%changelog
+* Wed Dec 16 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.11-2
+- Drop conditionals, always build the bytecode interpreter (now also in Fedora)
+ and subpixel rendering (as that's the only reason to build freetype-freeworld
+ at all)
+- Drop 99-DejaVu-autohinter-only.conf
+
* Wed Dec 16 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.11-1
- Update to 2.3.11 (matches Fedora freetype, fixes aliasing issue rh#513582)
- Drop upstreamed memcpy-fix patch
--- 99-DejaVu-autohinter-only.conf DELETED ---
14 years, 4 months
rpms/freetype-freeworld/F-12 .cvsignore, 1.5, 1.6 freetype-freeworld.spec, 1.6, 1.7 sources, 1.5, 1.6 freetype-2.2.1-memcpy-fix.patch, 1.1, NONE
by Kevin Kofler
Author: kkofler
Update of /cvs/free/rpms/freetype-freeworld/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3364/F-12
Modified Files:
.cvsignore freetype-freeworld.spec sources
Removed Files:
freetype-2.2.1-memcpy-fix.patch
Log Message:
* Wed Dec 16 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.11-1
- Update to 2.3.11 (matches Fedora freetype, fixes aliasing issue rh#513582)
- Drop upstreamed memcpy-fix patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 20 Mar 2009 18:51:02 -0000 1.5
+++ .cvsignore 16 Dec 2009 23:50:48 -0000 1.6
@@ -1 +1 @@
-freetype-2.3.9.tar.bz2
+freetype-2.3.11.tar.bz2
Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-12/freetype-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- freetype-freeworld.spec 28 Mar 2009 03:11:45 -0000 1.6
+++ freetype-freeworld.spec 16 Dec 2009 23:50:48 -0000 1.7
@@ -7,8 +7,8 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
-Version: 2.3.9
-Release: 2%{?dist}
+Version: 2.3.11
+Release: 1%{?dist}
License: FTL or GPLv2+
Group: System Environment/Libraries
URL: http://www.freetype.org
@@ -21,9 +21,6 @@
# Enable otvalid and gxvalid modules
Patch46: freetype-2.2.1-enable-valid.patch
-# Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841
-Patch89: freetype-2.2.1-memcpy-fix.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
%if !0%{?without_bytecode_interpreter}
@@ -77,8 +74,6 @@
%patch46 -p1 -b .enable-valid
-%patch89 -p1 -b .memcpy
-
%build
%configure --disable-static
@@ -127,6 +122,10 @@
%config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf
%changelog
+* Wed Dec 16 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.11-1
+- Update to 2.3.11 (matches Fedora freetype, fixes aliasing issue rh#513582)
+- Drop upstreamed memcpy-fix patch
+
* Sat Mar 28 2009 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.3.9-2
- Provides freetype-bytecode and freetype-subpixel (rh#155210)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 20 Mar 2009 18:51:02 -0000 1.5
+++ sources 16 Dec 2009 23:50:48 -0000 1.6
@@ -1 +1 @@
-d76233108aca9c9606cdbd341562ad9a freetype-2.3.9.tar.bz2
+519c7cbf5cbd72ffa822c66844d3114c freetype-2.3.11.tar.bz2
--- freetype-2.2.1-memcpy-fix.patch DELETED ---
14 years, 4 months