rpms/marlin/devel import.log, NONE, 1.1 marlin-0.13-icon-path.patch, NONE, 1.1 marlin-0.13-link-fix.patch, NONE, 1.1 marlin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Dodji Seketeli
dodji at fedoraproject.org
Tue Feb 24 21:22:19 UTC 2009
Author: dodji
Update of /cvs/pkgs/rpms/marlin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23386/devel
Modified Files:
.cvsignore sources
Added Files:
import.log marlin-0.13-icon-path.patch
marlin-0.13-link-fix.patch marlin.spec
Log Message:
* Tue Feb 24 2009 Dodji Seketeli <dodji at redhat.org>
- Initial import
--- NEW FILE import.log ---
marlin-0_13-4_fc10:HEAD:marlin-0.13-4.fc10.src.rpm:1235510382
marlin-0.13-icon-path.patch:
--- NEW FILE marlin-0.13-icon-path.patch ---
diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in
index ba6871e..738776a 100644
--- a/pixmaps/Makefile.in
+++ b/pixmaps/Makefile.in
@@ -225,7 +225,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-icondir = $(datadir)/icons/hicolor/48x48/apps/marlin.png
+icondir = $(datadir)/icons/hicolor/48x48/apps
icon_DATA = marlin.png
pixmapdir = $(datadir)/pixmaps/marlin
BITMAPS = \
marlin-0.13-link-fix.patch:
--- NEW FILE marlin-0.13-link-fix.patch ---
diff --git a/src/Makefile.in b/src/Makefile.in
index e748186..87a2125 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -321,6 +321,7 @@ marlin_LDADD = $(MARLIN_LIBS) \
$(UNIQUE_LIBS) \
$(BURN_LIBS) \
$(INTLLIBS) \
+ $(top_builddir)/marlin/libmarlin-soundtouch.la \
$(top_builddir)/marlin/libmarlin.la \
$(top_builddir)/marlin/libmarlinx.la \
$(top_builddir)/src/libegg/libegg.la \
--- NEW FILE marlin.spec ---
%define gtk_version 2.14
%define gconf_version 2.14
%define unique_version 0.9.3
%define gstreamer_version 0.10
%define jack_version 0.102.29
%define samplerate_version 0.1.2
%define soundtouch_version 1.3.1
%define intltool_version 0.21
Name: marlin
Version: 0.13
Release: 4%{?dist}
Summary: A Sound Sample Editor for GNOME
Group: Applications/Multimedia
License: GPLv2+
URL: http://live.gnome.org/Marlin
Source0: http://folks.o-hand.com/iain/%{name}-releases/%{name}-%{version}.tar.bz2
# Patch filed upstream at http://bugzilla.gnome.org/show_bug.cgi?id=572749
Patch0: %{name}-%{version}-link-fix.patch
# Patch filed upstream at http://bugzilla.gnome.org/show_bug.cgi?id=572750
Patch1: %{name}-%{version}-icon-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: GConf2-devel >= %{gconf_version}
BuildRequires: gtk2-devel >= %{gtk_version}
BuildRequires: unique-devel >= %{unique_version}
BuildRequires: gstreamer-devel >= %{gstreamer_version}
BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_version}
BuildRequires: jack-audio-connection-kit-devel >= %{jack_version}
BuildRequires: libsamplerate-devel >= %{samplerate_version}
BuildRequires: soundtouch-devel >= %{soundtouch_version}
BuildRequires: intltool >= %{intltool_version}
BuildRequires: desktop-file-utils
BuildRequires: libtool
Requires(pre): GConf2 >= %{gconf_version}
Requires(post): GConf2 >= %{gconf_version}
Requires(preun): GConf2 >= %{gconf_version}
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
%description
Marlin aims to be a fully featured and powerful sample editor for the
GNOME2 platform.
%prep
%setup -q
%patch0 -p1 -b .link-fix
%patch1 -p1 -b .icon-path
%build
%configure
#use system libtool to disable standard RPATH
make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
%find_lang %{name} --with-gnome
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
--delete-original \
%{buildroot}/%{_datadir}/applications/%{name}.desktop
%clean
rm -rf %{buildroot}
%pre
if [ "$1" -gt 1 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule \
%{_sysconfdir}/gconf/schemas/%{name}.schemas
>& /dev/null || :
fi
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
fi
%post
/sbin/ldconfig
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
update-desktop-database &> /dev/null || :
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor ||:
fi
%postun
/sbin/ldconfig
scrollkeeper-update -q || :
update-desktop-database &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
fi
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS README NEWS
%{_bindir}/%{name}
%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_libdir}/*.so.*
%{_libdir}/%{name}-%{version}/*.so.*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/%{name}/
%{_datadir}/pixmaps/%{name}/
%exclude %{_libdir}/*.so
%exclude %{_libdir}/*.la
%exclude %{_libdir}/*.a
%exclude %{_libdir}/%{name}-%{version}/*.a
%exclude %{_libdir}/%{name}-%{version}/*.la
%exclude %{_libdir}/%{name}-%{version}/*.so
%exclude %{_includedir}/lib%{name}/
%changelog
* Sun Feb 22 2009 Dodji Seketeli <dodji at redhat.org> 0.13-4
- Patch to fix broken application menu icon installation
* Thu Feb 19 2009 Dodji Seketeli <dodji at redhat.org> 0.13-3
- Remove --vendor from desktop-file-install
- Remove 'Requires(post)/(postun): desktop-file-utils'
- Use system libtool to disable standard rpath
* Wed Feb 18 2009 Dodji Seketeli <dodji at redhat.org> 0.13-2
- Killed $RPM_BUILD_ROOT in favour of %%{buildroot}
- Added a %%pre section to remove potentially
- Fix scrollkeeper-update and update-desktop-database scriptlets.
- Added correct Requires(post[un]) for desktop-file-utils
* Tue Feb 17 2009 Dodji Seketeli <dodji at redhat.org> 0.13-1
- Initial import
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/marlin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Feb 2009 21:06:36 -0000 1.1
+++ .cvsignore 24 Feb 2009 21:21:48 -0000 1.2
@@ -0,0 +1 @@
+marlin-0.13.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/marlin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Feb 2009 21:06:36 -0000 1.1
+++ sources 24 Feb 2009 21:21:48 -0000 1.2
@@ -0,0 +1 @@
+647d08e86ed193a7c48fcd62afd57c77 marlin-0.13.tar.bz2
More information about the fedora-extras-commits
mailing list