diff options
Diffstat (limited to 'redhat/extras')
| -rw-r--r-- | redhat/extras/akode/trinity-akode.spec | 79 | ||||
| -rw-r--r-- | redhat/extras/kasablanca/trinity-kasablanca.spec | 15 | ||||
| -rw-r--r-- | redhat/extras/kdebluetooth/kdebluetooth-fix_gcc_46_compilation.patch | 67 | ||||
| -rw-r--r-- | redhat/extras/kdebluetooth/kdebluetooth-trinity.patch | 33 | ||||
| -rw-r--r-- | redhat/extras/kdebluetooth/trinity-kdebluetooth.spec | 54 | ||||
| -rw-r--r-- | redhat/extras/libkarma/trinity-libkarma.spec (renamed from redhat/extras/libkarma/libkarma.spec) | 21 |
6 files changed, 152 insertions, 117 deletions
diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode.spec index b67cbddc5..7f24416ce 100644 --- a/redhat/extras/akode/trinity-akode.spec +++ b/redhat/extras/akode/trinity-akode.spec @@ -1,10 +1,10 @@ -# Always install under '/usr' -%define _prefix /usr +%define _prefix /opt/trinity +%define _docdir %{_datadir}/doc Summary: Audio-decoding framework -Name: akode +Name: trinity-akode Version: 2.0.2 -Release: 6%{?dist} +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -101,11 +101,11 @@ Requires: %{name} = %{version}-%{release} # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f admin/Makefile.common cvs %build @@ -193,69 +193,6 @@ done %changelog -* Fri Jan 13 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-6 +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1 - Port to TDE 3.5.13 - Based on spec file from Fedora 9 'akode-2.0.2-5' - -* Tue Feb 12 2008 Rex Dieter <rdieter@fedoraproject.org> 2.0.2-5 -- gcc43 patch - -* Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-4 -- -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio) - -* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-3 -- fix flac113 support - -* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-2 -- fix multilib conflicts (#340591) - -* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1 -- akode-2.0.2 - -* Wed Sep 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-9 -- BR: pulseaudio-libs-devel - -* Mon Aug 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-8 -- -libsamplerate: License: GPLv2+ -- omit oss_sink - -* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-7 -- Requires: %%{name}-pulseaudio (f8+) -- License: LGPLv2+ - -* Thu Feb 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-6 -- respin (for flac, fc7+) - -* Mon Feb 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.1-5 -- enable pulseaudio support -- Requires: akode-pulseaudio (f7+) - -* Thu Dec 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-4 -- enable jack support (subpkg) -- package (GPL'd) libsamplerate-based resampler separately, - to keep main pkg LGPL-clean - -* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-2 -- fc6 respin - -* Mon Aug 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.0.1-1 -- 2.0.1 - -* Fri Jul 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> -- fc6: gcc/glibc respin - -* Fri Feb 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> -- fc5: gcc/glibc respin - -* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-1 -- 2.0(final) - -* Wed Nov 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-0.4.rc1 -- 2.0rc1 - -* Wed Nov 23 2005 Rex Dieter <rexdieter[AT]users.sf.net. 2.0-0.2.b3 -- --without-libltdl - -* Tue Nov 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-0.1.b3 -- akode-2.0b3 - diff --git a/redhat/extras/kasablanca/trinity-kasablanca.spec b/redhat/extras/kasablanca/trinity-kasablanca.spec index 26ff6c296..4604d7491 100644 --- a/redhat/extras/kasablanca/trinity-kasablanca.spec +++ b/redhat/extras/kasablanca/trinity-kasablanca.spec @@ -1,4 +1,11 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_datadir}/doc +%endif + %define kdecomp kasablanca +%define tde_docdir %{_docdir}/kde Name: trinity-%{kdecomp} Summary: Graphical FTP client @@ -41,11 +48,11 @@ Kasablanca is an ftp client, among its features are currently: # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -128,7 +135,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %{_datadir}/apps/kasablanca/ %{_datadir}/config*/* %{_datadir}/icons/hicolor/*/*/* - +%{tde_docdir}/HTML/en/kasablanca %changelog * Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.0.2-1 diff --git a/redhat/extras/kdebluetooth/kdebluetooth-fix_gcc_46_compilation.patch b/redhat/extras/kdebluetooth/kdebluetooth-fix_gcc_46_compilation.patch new file mode 100644 index 000000000..74eb71fa7 --- /dev/null +++ b/redhat/extras/kdebluetooth/kdebluetooth-fix_gcc_46_compilation.patch @@ -0,0 +1,67 @@ +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/libqobex/qobex/qobexbttransport.cpp.ORI 2012-05-06 16:47:30.512410613 -0400 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/libqobex/qobex/qobexbttransport.cpp 2012-05-06 16:47:33.712352364 -0400 +@@ -54,8 +54,9 @@ + QObexBtTransport::QObexBtTransport( QObject* parent, const char* name ) + : QObexTransport( parent, name ) { + myDebug(( "QObexBtTransport::QObexBtTransport( ... )" )); +- bacpy( &mDest, BDADDR_ANY ); +- bacpy( &mSrc, BDADDR_ANY ); ++ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}}; ++ bacpy( &mDest, &bdaddr_any ); ++ bacpy( &mSrc, &bdaddr_any ); + mChannel = -1; + + open(); +@@ -76,7 +77,9 @@ + + mRegisterSdp = false; + mSdpHandle = 0; +- bacpy( &mSrc, BDADDR_ANY ); ++ ++ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}}; ++ bacpy( &mSrc, &bdaddr_any ); + mChannel = -1; + } + +@@ -119,7 +122,8 @@ + + // If the user has not specified an address + // discover devices speaking OBEX, take the first best ... +- if ( 0 == bacmp( &mDest, BDADDR_ANY ) ) { ++ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}}; ++ if ( 0 == bacmp( &mDest, &bdaddr_any ) ) { + if ( !discover() ) { + myDebug(( "QObexBtTransport::connect(): Can not discover device" )); + error( ConnectionRefused ); +@@ -326,7 +330,8 @@ + // If this profile is not found return an error. + int channel = -1; + +- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, &addr, SDP_STANDARD_CONNECT_FLAGS ); ++ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}}; ++ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &addr, SDP_STANDARD_CONNECT_FLAGS ); + if ( sdp ) { + myDebug(( "QObexBtTransport::getRfCommChannel(): sdp session opened" )); + +@@ -369,7 +374,9 @@ + { + myDebug(( "QObexBtTransport::registerSdp()" )); + +- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, BDADDR_LOCAL, SDP_STANDARD_CONNECT_FLAGS ); ++ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}}; ++ bdaddr_t bdaddr_local = {{0, 0, 0, 0xff, 0xff, 0xff}}; ++ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &bdaddr_local, SDP_STANDARD_CONNECT_FLAGS ); + if ( !sdp ) + return false; + +@@ -479,7 +486,9 @@ + { + myDebug(( "QObexBtTransport::unregisterSdp()" )); + +- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, BDADDR_LOCAL, SDP_STANDARD_CONNECT_FLAGS ); ++ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}}; ++ bdaddr_t bdaddr_local = {{0, 0, 0, 0xff, 0xff, 0xff}}; ++ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &bdaddr_local, SDP_STANDARD_CONNECT_FLAGS ); + if ( !sdp ) + return false; + diff --git a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch index db62a3b8c..e62d343a8 100644 --- a/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch +++ b/redhat/extras/kdebluetooth/kdebluetooth-trinity.patch @@ -54,8 +54,12 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh ;; --- kdebluetooth-1.0~beta9~r769275/kdebluetooth/libkbluetooth/Makefile.am.ORI 2012-02-12 14:40:37.124683567 +0100 +++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/libkbluetooth/Makefile.am 2012-02-12 14:41:13.572933231 +0100 -@@ -12,7 +12,7 @@ - libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-qt-1 +@@ -9,10 +9,10 @@ + namerequest.cpp adapter_old.cpp obexmanager.cpp obexsession.cpp + + libkbluetooth_la_LDFLAGS = $(all_libraries) +-libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-qt-1 ++libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-tqt-1 libkbluetoothincludedir = $(includedir)/libkbluetooth -libkbluetoothinclude_HEADERS = adapter.h dbusinit.h dbussignal.h dbussignal.h manager.h inputdevice.h inputmanager.h \ @@ -70,7 +74,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh kbluetooth_SOURCES = adapterconfig.cpp adapterdialog.ui authorize.cpp authdialog.ui deviceconfig.cpp trayicon.cpp main.cpp application.cpp pindefdialog.ui pindialog.cpp confirmationdlgbase.ui confirmation.cpp rfcommportlistener.cpp procinheritsock.cpp portlistener.cpp sdprecord.cpp -kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -+kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lDCOP -lkdefx ++kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx kbluetooth_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) # this is where the desktop file will go @@ -81,7 +85,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh kbluemon_SOURCES = main.cpp monitor.cpp mondialog.ui -kbluemon_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -+kbluemon_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lkdefx ++kbluemon_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lkdefx kbluemon_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) # this is where the desktop file will go @@ -92,7 +96,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh kbluelock_SOURCES = main.cpp kbluelock.cpp lockdialog.ui -kbluelock_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -+kbluelock_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lDCOP -lkdefx ++kbluelock_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx kbluelock_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) # this is where the desktop file will go @@ -103,7 +107,7 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh kinputwizard_SOURCES = main.cpp inputwizard.cpp inputdialog.ui inputdialog_ext.ui -kinputwizard_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -+kinputwizard_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries) -lkdefx ++kinputwizard_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lkdefx kinputwizard_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) @@ -120,12 +124,25 @@ diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh # this is where the desktop file will go --- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexclient/Makefile.am.ORI 2012-02-12 15:35:17.239735523 +0100 +++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexclient/Makefile.am 2012-02-12 15:35:25.381845659 +0100 -@@ -17,7 +17,7 @@ +@@ -17,8 +17,8 @@ # the application source, library search path, and link libraries -kbtobexclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) +kbtobexclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lkdefx - kbtobexclient_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS) $(DBUS_LIBS) -ldbus-qt-1 +-kbtobexclient_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS) $(DBUS_LIBS) -ldbus-qt-1 ++kbtobexclient_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS) $(DBUS_LIBS) -ldbus-tqt-1 # this is where the desktop file will go + #shelldesktopdir = $(kde_appsdir)/Utilities +--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kcm_btpaired/Makefile.am.ORI 2012-05-06 16:27:34.359953095 -0400 ++++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kcm_btpaired/Makefile.am 2012-05-06 16:27:41.351939071 -0400 +@@ -6,7 +6,7 @@ + + kcm_btpaired_la_SOURCES = pairedtabbase.ui pairedtab.cpp kcm_btpaired.cpp \ + exportdialog.ui +-kcm_btpaired_la_LIBADD = $(LIB_KIO) ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) $(SDP_LIBS) $(DBUS_LIBS) -ldbus-qt-1 ++kcm_btpaired_la_LIBADD = $(LIB_KIO) ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) $(SDP_LIBS) $(DBUS_LIBS) -ldbus-tqt-1 + kcm_btpaired_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) + + #kbluetoothdcm_DATA = kcm_btpaired.desktop diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec index b9d3aa2b2..1a9790e46 100644 --- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec +++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec @@ -1,9 +1,12 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif +%define tde_docdir %{_docdir}/kde + + Name: trinity-kdebluetooth Version: 1.0_beta9_r769275 Release: 1%{?dist}%{?_variant} @@ -18,6 +21,7 @@ Source0: kdebluetooth_1.0~beta9~r769275.orig.tar.gz Patch0: kdebluetooth-1.0_beta8-gcc43.patch Patch1: kdebluetooth_1.0~beta9~r769275-0ubuntu1.diff.gz Patch2: kdebluetooth-trinity.patch +Patch3: kdebluetooth-fix_gcc_46_compilation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -31,7 +35,7 @@ BuildRequires: openobex-devel >= 1.1 BuildRequires: libusb-devel BuildRequires: pkgconfig Buildrequires: libidn-devel -Buildrequires: dbus-qt-devel +Buildrequires: dbus-tqt-devel BuildRequires: obexftp-devel BuildRequires: automake >= 1.6.1 BuildRequires: autoconf >= 2.52 @@ -77,25 +81,27 @@ KDE Bluetooth framework development libraries and headers. %setup -q -n kdebluetooth-1.0~beta9~r769275 %patch0 -p1 %patch1 -p1 -%patch2 -p1 +%patch2 -p1 -b .trinity +%patch3 -p1 -b .gcc46 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -if [ -r "/usr/share/libtool/config/ltmain.sh" ]; then - %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -else - %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -fi +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" %build export PATH="%{_bindir}:${PATH}" export LDFLAGS="-L%{_libdir} -I%{_includedir}" -export CXXFLAGS="-fpermissive" +export CXXFLAGS="${CXXFLAGS} -I%{_includedir}/dbus-1.0" unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ - --with-bluetooth-libraries=%{_libdir} \ --disable-rpath \ --enable-new-ldflags \ --disable-debug \ @@ -104,13 +110,13 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh --enable-closure \ --with-extra-includes=%{_includedir}/tqt -make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool +%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool %install export PATH="%{_bindir}:${PATH}" -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%__rm -rf $RPM_BUILD_ROOT +%__make install DESTDIR=$RPM_BUILD_ROOT for DESK_PATH in applications/kde applnk/Utilities ; do desktop-file-install \ @@ -168,17 +174,17 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2> /dev/null ||: %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mimelnk/bluetooth/ %{_datadir}/service*/* -%lang(ca) %{_docdir}/HTML/ca/kdebluetooth/ -%lang(da) %{_docdir}/HTML/da/kdebluetooth/ -%lang(en) %{_docdir}/HTML/en/kdebluetooth/ -%lang(es) %{_docdir}/HTML/es/kdebluetooth/ -%lang(et) %{_docdir}/HTML/et/kdebluetooth/ -%lang(fr) %{_docdir}/HTML/fr/kdebluetooth/ -%lang(it) %{_docdir}/HTML/it/kdebluetooth/ -%lang(nl) %{_docdir}/HTML/nl/kdebluetooth/ -%lang(pt) %{_docdir}/HTML/pt/kdebluetooth/ -%lang(ru) %{_docdir}/HTML/ru/kdebluetooth/ -%lang(sv) %{_docdir}/HTML/sv/kdebluetooth/ +%lang(ca) %{tde_docdir}/HTML/ca/kdebluetooth/ +%lang(da) %{tde_docdir}/HTML/da/kdebluetooth/ +%lang(en) %{tde_docdir}/HTML/en/kdebluetooth/ +%lang(es) %{tde_docdir}/HTML/es/kdebluetooth/ +%lang(et) %{tde_docdir}/HTML/et/kdebluetooth/ +%lang(fr) %{tde_docdir}/HTML/fr/kdebluetooth/ +%lang(it) %{tde_docdir}/HTML/it/kdebluetooth/ +%lang(nl) %{tde_docdir}/HTML/nl/kdebluetooth/ +%lang(pt) %{tde_docdir}/HTML/pt/kdebluetooth/ +%lang(ru) %{tde_docdir}/HTML/ru/kdebluetooth/ +%lang(sv) %{tde_docdir}/HTML/sv/kdebluetooth/ %files libs diff --git a/redhat/extras/libkarma/libkarma.spec b/redhat/extras/libkarma/trinity-libkarma.spec index cd7339145..364567f05 100644 --- a/redhat/extras/libkarma/libkarma.spec +++ b/redhat/extras/libkarma/trinity-libkarma.spec @@ -1,7 +1,9 @@ -%define major 0 +%define _prefix /opt/trinity +%define _docdir %{_datadir}/doc +%define _mandir %{_datadir}/man Summary: Rio Karma tools -Name: libkarma +Name: trinity-libkarma Version: 0.1.2 Release: 1%{?dist} License: GPLv2+ @@ -16,6 +18,7 @@ BuildRequires: mono-devel BuildRequires: taglib-devel BuildRequires: libusb-devel BuildRequires: zlib-devel + Requires: %{name}-libs >= %version %define _requires_exceptions libkarma @@ -33,9 +36,7 @@ Rio Karma access library %package devel Summary: Rio Karma development files Group: Development/C -Requires: %{name}-libs = %version -Provides: %name-devel = %version-%release -Obsoletes: %name-devel +Requires: %{name}-libs = %version %description devel Rio Karma development files @@ -44,7 +45,7 @@ Rio Karma development files %package -n karma-sharp Summary: Rio Karma C# bindings Group: Development/Other -Requires: %name = %version +Requires: %{name} = %version %description -n karma-sharp Rio Karma C# bindings @@ -104,11 +105,11 @@ rm -rf $RPM_BUILD_ROOT %_mandir/man1/*.1* %attr(4755,root,root) %_bindir/karma_helper %_datadir/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png -%_docdir/%{name} +%_docdir/libkarma %files libs %defattr(-,root,root) -%_libdir/libkarma.so.%{major}* +%_libdir/libkarma.so.0* %files devel %defattr(-,root,root) @@ -125,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Nov 28 2011 Francois Andriot <francois.andriot@free.fr> 0.1.2-1 -- Build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +* 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' |