RHEL/Fedora: adds support for Mandriva 2011 in packaging

4 files changed, 124 insertions, 72 deletions

diff --git a/redhat/extras/akode/akode-cflags.patch b/redhat/extras/akode/akode-cflags.patch
deleted file mode 100644
index ecad48ff6..000000000
--- a/redhat/extras/akode/akode-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- akode-2.0.2/akode/lib/Makefile.am.ORI	2012-01-16 19:17:09.849211160 +0100
-+++ akode-2.0.2/akode/lib/Makefile.am	2012-01-16 19:17:24.496410002 +0100
-@@ -12,6 +12,7 @@
-                       player.cpp magic.cpp
- 
- AM_CPPFLAGS = -DAKODE_SEARCHDIR=\"$(libdir)\"
-+AM_CXXFLAGS = -fPIC
- 
- libakode_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries)
- libakode_la_LIBADD =  $(LIBPTHREAD) $(AKODE_LIBDL) $(LIBSEM)
diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode.spec
index 1395777de..6579f7bef 100644
--- a/redhat/extras/akode/trinity-akode.spec
+++ b/redhat/extras/akode/trinity-akode.spec
@@ -1,14 +1,14 @@
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
 %endif
 
 # TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_mandir %{tde_datadir}/man
 
 %define tde_tdeappdir %{tde_datadir}/applications/kde
@@ -21,7 +21,7 @@
 Summary: Audio-decoding framework 
 Name:	 trinity-akode 
 Version: 2.0.2
-Release: 1%{?dist}%{?_variant}
+Release: 2%{?dist}%{?_variant}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -29,7 +29,8 @@ Group: 	 System Environment/Libraries
 URL:	 http://www.kde-apps.org/content/show.php?content=30375
 Source0: http://www.kde-apps.org/CONTENT/content-files/akode-%{version}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 # Legacy Fedora 9 patches
@@ -47,7 +48,7 @@ Patch10: akode-autotools.patch
 %define _with_libsamplerate --with-libsamplerate
 
 # Pulseaudio is not available on RHEL 5 and earlier
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion}
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion}
 %define _with_pulseaudio --with-pulseaudio
 %endif
 
@@ -57,7 +58,7 @@ BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: speex-devel
 
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
 %{?_with_jack:BuildRequires: %{_lib}jack-devel}
 %{?_with_flac:BuildRequires: %{_lib}flac-devel}
 %{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
@@ -164,7 +165,7 @@ Requires: %{name} = %{version}-%{release}
 %__make install DESTDIR=%{buildroot}
 
 # unpackaged files
-%__rm -f %{buildroot}%{_libdir}/lib*.a
+%__rm -f %{buildroot}%{tde_libdir}/*.a
 
 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
diff --git a/redhat/extras/libkarma/trinity-libkarma.spec b/redhat/extras/libkarma/trinity-libkarma.spec
index 364567f05..242f933ac 100644
--- a/redhat/extras/libkarma/trinity-libkarma.spec
+++ b/redhat/extras/libkarma/trinity-libkarma.spec
@@ -1,76 +1,102 @@
-%define _prefix /opt/trinity
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
 
 Summary:   	Rio Karma tools
 Name:      	trinity-libkarma
 Version:   	0.1.2
-Release:   	1%{?dist}
+Release:   	2%{?dist}
 License:   	GPLv2+
 Group:     	System/Libraries
 Url:	   	http://www.freakysoft.de/html/libkarma/
+
 Source:   	http://www.freakysoft.de/libkarma/libkarma-%{version}.tar.gz
-Source2: http://bobcopeland.com/karma/banshee/preferences.fdi
-Source3: http://bobcopeland.com/karma/banshee/multimedia-player-rio-karma.png
-Source4: karma-sharp.dll.config
+Source2:	http://bobcopeland.com/karma/banshee/preferences.fdi
+Source3:	http://bobcopeland.com/karma/banshee/multimedia-player-rio-karma.png
+Source4:	karma-sharp.dll.config
+
+# [libkarma] Fix installation directories
+Patch1:		libkarma-0.1.2-fix_installation.patch
+
 BuildRoot: 	%{_tmppath}/%name-root
+
 BuildRequires: mono-devel
 BuildRequires: taglib-devel
 BuildRequires: libusb-devel
 BuildRequires: zlib-devel
 
-Requires: %{name}-libs >= %version
-%define _requires_exceptions libkarma
+Obsoletes:		trinity-libkarma-libs < %{version}-%{release}
+Provides:		trinity-libkarma-libs = %{version}-%{release}
 
 %description
 Rio Karma access library
 
-%package libs
-Summary: Rio Karma access library
-Group: System/Libraries
-
-%description libs
-Rio Karma access library
-
 
 %package devel
 Summary:   	Rio Karma development files
 Group:     	Development/C
-Requires:	%{name}-libs = %version
+Requires:	%{name} = %{version}-%{release}
 
 %description devel
 Rio Karma development files
 
 
-%package -n karma-sharp
+%package -n trinity-karma-sharp
 Summary:   	Rio Karma C# bindings
 Group:     	Development/Other
-Requires:	%{name} = %version
+Requires:	%{name} = %{version}-%{release}
+
+Obsoletes:	karma-sharp < %{version}-%{release}
+Provides:	karma-sharp = %{version}-%{release}
 
-%description -n karma-sharp
+%description -n trinity-karma-sharp
 Rio Karma C# bindings
 
 
 %prep
 %setup -q -n libkarma-%{version}
+%patch1 -p1 -b .fixdir
 
 %build
-make PREFIX=$RPM_BUILD_ROOT/%_prefix
+# Do *NOT* use LIBDIR variable, it is used for internal purpose !!!
+%__make \
+  DESTDIR=%{?buildroot} \
+  PREFIX=%{tde_prefix} \
+  LIB=%{_lib}
+  
 
 %install
-rm -rf $RPM_BUILD_ROOT installed-docs
-mkdir -p $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT/%_prefix CHOWNPROG=/bin/true CHGRPPROG=/bin/true
-perl -pi -e "s^%buildroot^^" %buildroot%_prefix/lib/pkgconfig/karma-sharp.pc
-%if %_lib != lib
-mv %buildroot%_prefix/lib %buildroot%_libdir
-perl -pi -e "s^/lib^/%_lib^" %buildroot%_libdir/pkgconfig/karma-sharp.pc
-%endif
+%__rm -rf $RPM_BUILD_ROOT
+%__mkdir_p $RPM_BUILD_ROOT
+
+%__make install \
+  DESTDIR=%{?buildroot} \
+  PREFIX=%{tde_prefix} \
+  LIB=%{_lib} \
+  CHOWNPROG=/bin/true \
+  CHGRPPROG=/bin/true
 
 
 install -m 644 -D libkarma.fdi %buildroot%_sysconfdir/hal/fdi/information/20-rio-karma.fdi
 install -m 644 -D %SOURCE2 %buildroot%_sysconfdir/hal/fdi/policy/preferences.fdi
-install -m 644 -D %SOURCE3 %buildroot%_datadir/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
+install -m 644 -D %SOURCE3 %buildroot%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
 
 cat > README%{?dist} << EOF
 For automatic mounting, add the following line to your
@@ -81,51 +107,61 @@ device, as it doesn't know about the Karma's proprietary filesystem.
 
 EOF
 
-install -m 644 %SOURCE4 %buildroot%_libdir/karma-sharp/karma-sharp.dll.config
+install -m 644 -D %SOURCE4 %buildroot%{tde_libdir}/karma-sharp/karma-sharp.dll.config
+
+# Removes doc
+%__rm -rf %{?buildroot}%{tde_docdir}/libkarma/
 
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
 
 %post
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
 
 %postun
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc THANKS TODO README%{?dist}
+%doc ChangeLog THANKS TODO README%{?dist}
 %config(noreplace) %_sysconfdir/hal/fdi/information/20-rio-karma.fdi
 %config(noreplace) %_sysconfdir/hal/fdi/policy/preferences.fdi
-%_bindir/riocp
-%_bindir/chprop
-%_mandir/man1/*.1*
-%attr(4755,root,root) %_bindir/karma_helper
-%_datadir/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
-%_docdir/libkarma
-
-%files libs
-%defattr(-,root,root)
-%_libdir/libkarma.so.0*
+%{tde_bindir}/riocp
+%{tde_bindir}/chprop
+%{tde_mandir}/man1/*.1*
+%attr(4755,root,root) %{tde_bindir}/karma_helper
+%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
+%{tde_libdir}/libkarma.so.0*
 
 %files devel
 %defattr(-,root,root)
-%_includedir/*
-%_libdir/libkarma.a
-%_libdir/libkarma.so
+%{tde_includedir}/libkarma/
+%{tde_libdir}/libkarma.a
+%{tde_libdir}/libkarma.so
 
-%files -n karma-sharp
+%files -n trinity-karma-sharp
 %defattr(-,root,root)
-%_libdir/karma-sharp/*
-%_libdir/pkgconfig/karma-sharp.pc
+%{tde_libdir}/karma-sharp/*
+%{tde_libdir}/pkgconfig/karma-sharp.pc
 
 
 
 
 %changelog
+* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> 0.1.2-2
+- Add support for MGA2 and MDV2011
+- Removes 'libs' subpackage
+- Fix installation directories
+
 * Mon Apr 30 2012 Francois Andriot <francois.andriot@free.fr> 0.1.2-1
 - Build for RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17
 - Based on 'libkarma-0.1.2-1mdv2011.0'
diff --git a/redhat/extras/trinity-live/tperl.spec b/redhat/extras/trinity-live/tperl.spec
new file mode 100644
index 000000000..d30c67929
--- /dev/null
+++ b/redhat/extras/trinity-live/tperl.spec
@@ -0,0 +1,25 @@
+Name:           tperl
+Version:        1.0
+Release:        1%{?dist}
+Summary:        Hack to get TDE installed with Perl
+
+License:        GPL
+URL:            http://www.trinitydesktop.org
+
+Requires:       perl
+Provides:	/bin/perl
+
+BuildArch:	noarch
+
+%description
+%{summary}
+
+%prep
+
+%build
+
+%install
+
+%files
+
+%changelog