RPM Packaging: updates for R14

pull/3/head
François Andriot 12 years ago
parent fd444009b6
commit eaa27cfab1

@ -126,7 +126,7 @@ BuildRequires: libvisual-devel
%if 0%{?mgaversion} && 0%{?mgaversion} <= 2 %if 0%{?mgaversion} && 0%{?mgaversion} <= 2
BuildRequires: libtunepimp-devel BuildRequires: libtunepimp-devel
%endif %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
BuildRequires: libtunepimp-devel BuildRequires: libtunepimp-devel
%endif %endif

@ -27,7 +27,7 @@ Name: trinity-%{kdecomp}
Summary: a DBUS notification service [Trinity] Summary: a DBUS notification service [Trinity]
Version: 0.1 Version: 0.1
Release: 4%{?dist}%{?_variant} Release: 4.1%{?dist}%{?_variant}
License: GPLv2+ License: GPLv2+
Group: Applications/Utilities Group: Applications/Utilities
@ -41,6 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-3.5.13.2.tar.gz Source0: %{name}-3.5.13.2.tar.gz
Patch1: kdbusnotification-14.0.0-fix_utf8.patch
BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2
BuildRequires: trinity-arts-devel >= 3.5.13.2 BuildRequires: trinity-arts-devel >= 3.5.13.2
BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
@ -66,6 +68,7 @@ DBUS notifications via unobtrusive, easily dismissed passive popups.
%prep %prep
%setup -q -n %{name}-3.5.13.2 %setup -q -n %{name}-3.5.13.2
%patch1 -p1 -b .utf8
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@ -117,6 +120,9 @@ export PATH="%{tde_bindir}:${PATH}"
%changelog %changelog
* Sun Jul 21 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4.1
- Fix UTF8 messages
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1-4
- Initial release for TDE 3.5.13.2 - Initial release for TDE 3.5.13.2

@ -1,11 +1,6 @@
# Default version for this component # Default version for this component
%define tde_pkg knetworkmanager %define tde_pkg knetworkmanager8
%define tde_version 14.0.0 %define tde_version 14.0.0
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
%define version 0.9
%else
%define version 0.8
%endif
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
@ -30,7 +25,7 @@
Name: trinity-%{tde_pkg} Name: trinity-%{tde_pkg}
Version: %{?version} Version: 0.8
Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
Summary: Trinity applet for Network Manager Summary: Trinity applet for Network Manager
@ -39,17 +34,10 @@ Group: Applications/Internet
License: GPLv2+ License: GPLv2+
URL: http://en.opensuse.org/Projects/KNetworkManager URL: http://en.opensuse.org/Projects/KNetworkManager
%if "%{?version}" == "0.9"
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
%else
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
%endif
Patch0: knetworkmanager-3.5.13-missing_includes.patch Patch0: knetworkmanager-3.5.13-missing_includes.patch
# For knetworkmanager 0.9 only !
Patch10: knetworkmanager-3.5.13-subdir_version.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Requires: kde-filesystem #Requires: kde-filesystem
@ -65,6 +53,9 @@ BuildRequires: trinity-dbus-1-tqt-devel
BuildRequires: trinity-dbus-tqt-devel BuildRequires: trinity-dbus-tqt-devel
BuildRequires: NetworkManager-glib-devel BuildRequires: NetworkManager-glib-devel
Obsoletes: trinity-knetworkmanager < %{version}-%{release}
Provides: trinity-knetworkmanager = %{version}-%{release}
%description %description
KNetworkManager is a system tray applet for controlling network KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon. connections on systems that use the NetworkManager daemon.
@ -75,6 +66,9 @@ Summary: Common data shared among the MySQL GUI Suites
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: trinity-knetworkmanager-devel < %{version}-%{release}
Provides: trinity-knetworkmanager-devel = %{version}-%{release}
%description devel %description devel
Development headers for knetworkmanager Development headers for knetworkmanager
@ -85,21 +79,12 @@ Development headers for knetworkmanager
%prep %prep
%if "%{?version}" == "0.9"
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%else
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%endif
%if "%{?version}" == "0.9"
%patch10 -p1
%endif
cd knetworkmanager-0.*/src cd knetworkmanager-0.*/src
%patch0 -p3 %patch0 -p3
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
@ -125,7 +110,8 @@ cd build
-DCMAKE_SKIP_RPATH="OFF" \ -DCMAKE_SKIP_RPATH="OFF" \
.. ..
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install
%__rm -rf $RPM_BUILD_ROOT %__rm -rf $RPM_BUILD_ROOT
@ -142,18 +128,22 @@ update-desktop-database %{tde_appdir} > /dev/null
touch --no-create %{tde_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun %postun
update-desktop-database %{tde_appdir} > /dev/null update-desktop-database %{tde_appdir} > /dev/null
/sbin/ldconfig /sbin/ldconfig
touch --no-create %{tde_datadir}/icons/hicolor || : touch --no-create %{tde_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%post devel %post devel
/sbin/ldconfig /sbin/ldconfig
%postun devel %postun devel
/sbin/ldconfig /sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/knetworkmanager %{tde_bindir}/knetworkmanager

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
tdp='cd ~/tde/tde-packaging/redhat' tdp='cd ~/tde/tde-packaging/redhat'
grp='tdp; ./genrpm.sh -v 3.5.13.2 -a' #grp='tdp; ./genrpm.sh -v 3.5.13.2 -a'
grp='tdp; ./genrpm.sh -v 14.0.0 -a'
BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)"
@ -75,10 +76,11 @@ grpiud() {
# Build dependencies # Build dependencies
rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" rm -rf "${BUILDDIR}" "${BUILDROOTDIR}"
if ! rpm -q libqt3-devel && ! rpm -q lib64qt3-devel && ! rpm -q qt3-devel; then #if ! rpm -q libqt3-devel && ! rpm -q lib64qt3-devel && ! rpm -q qt3-devel; then
grpiu dependencies/qt3 # grpiu dependencies/qt3
eval ${PKGINST} qt3-devel # eval ${PKGINST} qt3-devel
fi #fi
grpiud dependencies/tqt3
grpiud dependencies/tqtinterface grpiud dependencies/tqtinterface
grpi dependencies/arts grpi dependencies/arts
grpi dependencies/avahi-tqt grpi dependencies/avahi-tqt

@ -118,6 +118,5 @@ cd build
%changelog %changelog
* Thu Feb 16 2012 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE R14, using 'tqt3' instead of 'qt3' - Initial release for TDE R14.0.0

@ -59,6 +59,7 @@ easy to integrate CalDAV support into any PIM application.
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Obsoletes: libcaldav-devel < %{version}-%{release} Obsoletes: libcaldav-devel < %{version}-%{release}
Provides: libcaldav-devel = %{version}-%{release} Provides: libcaldav-devel = %{version}-%{release}

@ -56,7 +56,7 @@ Build dependencies are minimal, requiring only libcurl.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} Requires: %{name} = %{version}-%{release}
Obsoletes: libcarddav-devel < %{version}-%{release} Obsoletes: libcarddav-devel < %{version}-%{release}
Provides: libcarddav-devel = %{version}-%{release} Provides: libcarddav-devel = %{version}-%{release}

@ -29,10 +29,16 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: python-tqt-14.0.0-ftbfs.patch Patch0: python-tqt-14.0.0-ftbfs.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: python-sip
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tqscintilla-devel BuildRequires: trinity-tqscintilla-devel
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: sip-devel
%endif
%if 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: python-sip
%endif
# TDE specific building variables # TDE specific building variables
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqt3-devel >= 3.5.0

@ -17,7 +17,7 @@
Name: trinity-tqca Name: trinity-tqca
Version: 1.0 Version: 1.0
Release: 3%{?dist}%{?_variant} Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
Summary: TQt Cryptographic Architecture Summary: TQt Cryptographic Architecture

@ -262,7 +262,9 @@ This package contains a graphical configuration tool for programs using TQt 3.
%package devel %package devel
Summary: Development files for the TQt 3 GUI toolkit Summary: Development files for the TQt 3 GUI toolkit
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name}-designer = %{version}-%{release}
%description devel %description devel
The %{name}-devel package contains the files necessary to develop The %{name}-devel package contains the files necessary to develop

@ -1248,7 +1248,7 @@ find "%{buildroot}%{tde_tdedocdir}/HTML" -size 0 -exec rm -f {} \;
%endif %endif
%changelog %changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1

@ -506,5 +506,5 @@ fi
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE R14.0.0

@ -710,7 +710,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--with-sdl \ --with-sdl \
%if 0%{?with_db4} %if 0%{?with_db4}
--with-berkeley-db \ --with-berkeley-db \
%if 0%{?fedora} == 18 %if 0%{?fedora} >= 18
--with-db-lib=db_cxx-4 \ --with-db-lib=db_cxx-4 \
%endif %endif
%endif %endif
@ -747,6 +747,5 @@ fi
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE 14.0.0

@ -718,5 +718,5 @@ fi
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE R14.0.0

@ -473,7 +473,7 @@ Requires: trinity-kappfinder = %{version}-%{release}
Requires: trinity-kate = %{version}-%{release} Requires: trinity-kate = %{version}-%{release}
Requires: trinity-kwrite = %{version}-%{release} Requires: trinity-kwrite = %{version}-%{release}
Requires: trinity-kcontrol = %{version}-%{release} Requires: trinity-kcontrol = %{version}-%{release}
Requires: trinity-kdepasswd = %{version}-%{release} Requires: trinity-tdepasswd = %{version}-%{release}
Requires: trinity-tdeprint = %{version}-%{release} Requires: trinity-tdeprint = %{version}-%{release}
Requires: trinity-kdesktop = %{version}-%{release} Requires: trinity-kdesktop = %{version}-%{release}
Requires: trinity-tdm = %{version}-%{release} Requires: trinity-tdm = %{version}-%{release}
@ -1744,21 +1744,24 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
########## ##########
%package -n trinity-kdepasswd %package -n trinity-tdepasswd
Summary: password changer for TDE Summary: password changer for TDE
Group: Applications/Utilities Group: Applications/Utilities
%description -n trinity-kdepasswd Obsoletes: trinity-kdepasswd < %{version}-%{release}
Provides: trinity-kdepasswd = %{version}-%{release}
%description -n trinity-tdepasswd
This is a simple application which allows users to change their This is a simple application which allows users to change their
system passwords. system passwords.
%files -n trinity-kdepasswd %files -n trinity-tdepasswd
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/kdepasswd %{tde_bindir}/tdepasswd
%{tde_tdelibdir}/kcm_useraccount.la %{tde_tdelibdir}/kcm_useraccount.la
%{tde_tdelibdir}/kcm_useraccount.so %{tde_tdelibdir}/kcm_useraccount.so
%{tde_tdeappdir}/kcm_useraccount.desktop %{tde_tdeappdir}/kcm_useraccount.desktop
%{tde_tdeappdir}/kdepasswd.desktop %{tde_tdeappdir}/tdepasswd.desktop
%exclude %{tde_datadir}/apps/tdm/pics/users/default1.png %exclude %{tde_datadir}/apps/tdm/pics/users/default1.png
%exclude %{tde_datadir}/apps/tdm/pics/users/default2.png %exclude %{tde_datadir}/apps/tdm/pics/users/default2.png
%exclude %{tde_datadir}/apps/tdm/pics/users/default3.png %exclude %{tde_datadir}/apps/tdm/pics/users/default3.png
@ -1767,10 +1770,10 @@ system passwords.
%{tde_datadir}/config.kcfg/kcm_useraccount.kcfg %{tde_datadir}/config.kcfg/kcm_useraccount.kcfg
%{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg %{tde_datadir}/config.kcfg/kcm_useraccount_pass.kcfg
%post -n trinity-kdepasswd %post -n trinity-tdepasswd
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
%postun -n trinity-kdepasswd %postun -n trinity-tdepasswd
update-desktop-database %{tde_appdir} 2> /dev/null || : update-desktop-database %{tde_appdir} 2> /dev/null || :
########## ##########
@ -1959,7 +1962,7 @@ process which presents the user with a menu of possible hosts that offer
XDMCP display management. XDMCP display management.
A collection of icons to associate with individual users is included with A collection of icons to associate with individual users is included with
TDE, but as part of the kdepasswd package. TDE, but as part of the tdepasswd package.
The menu package will help to provide TDM with a list of window managers The menu package will help to provide TDM with a list of window managers
that can be launched, if the window manager does not register with TDM that can be launched, if the window manager does not register with TDM

@ -5,6 +5,8 @@
# or 64 bits: # or 64 bits:
# ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so # ln -s /usr/lib64/libgcj.so.5.0.0 /usr/lib/jvm/java/lib/libgcj.so
%define tde_version 14.0.0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
@ -107,7 +109,8 @@ BuildRequires: libgdk_pixbuf2.0-devel
%else %else
BuildRequires: %{_lib}gdk_pixbuf2.0-devel BuildRequires: %{_lib}gdk_pixbuf2.0-devel
%endif %endif
%else %endif
%if 0%{?fedora}
%if 0%{?fedora} >= 17 %if 0%{?fedora} >= 17
BuildRequires: gdk-pixbuf2-devel BuildRequires: gdk-pixbuf2-devel
%else %else
@ -930,7 +933,9 @@ Requires: trinity-libdcop-c = %{version}-%{release}
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: trinity-tdelibs-devel
Requires: trinity-tdelibs-devel >= %{tde_version}
Requires: %{name} = %{version}-%{release}
Obsoletes: trinity-kdebindings-devel < %{version}-%{release} Obsoletes: trinity-kdebindings-devel < %{version}-%{release}
Provides: trinity-kdebindings-devel = %{version}-%{release} Provides: trinity-kdebindings-devel = %{version}-%{release}
@ -1019,7 +1024,8 @@ fi
--enable-closure \ --enable-closure \
--enable-final \ --enable-final \
%{?_with_java} %{!?_with_java:--without-java} \ %{?_with_java} %{!?_with_java:--without-java} \
%{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \
--with-extra-includes=%{_includedir}/tqscintilla
# Build dcopperl with specific options # Build dcopperl with specific options
pushd dcopperl pushd dcopperl
@ -1100,5 +1106,5 @@ fi
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE R14.0.0

@ -1589,5 +1589,5 @@ fi
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE R14.0.0

@ -640,7 +640,7 @@ MRML server.
%{tde_tdelibdir}/libkmrmlpart.so %{tde_tdelibdir}/libkmrmlpart.so
%{tde_tdelibdir}/mrmlsearch.la %{tde_tdelibdir}/mrmlsearch.la
%{tde_tdelibdir}/mrmlsearch.so %{tde_tdelibdir}/mrmlsearch.so
%{tde_libdir}/lib[kt]deinit_mrmlsearch.so %{tde_libdir}/libtdeinit_mrmlsearch.so
%{tde_tdeappdir}/kcmkmrml.desktop %{tde_tdeappdir}/kcmkmrml.desktop
%{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop %{tde_datadir}/apps/konqueror/servicemenus/mrml-servicemenu.desktop
%{tde_datadir}/mimelnk/text/mrml.desktop %{tde_datadir}/mimelnk/text/mrml.desktop
@ -965,7 +965,7 @@ as well.
%{tde_tdelibdir}/libkviewcanvas.so %{tde_tdelibdir}/libkviewcanvas.so
%{tde_tdelibdir}/libkviewviewer.la %{tde_tdelibdir}/libkviewviewer.la
%{tde_tdelibdir}/libkviewviewer.so %{tde_tdelibdir}/libkviewviewer.so
%{tde_libdir}/lib[kt]deinit_kview.so %{tde_libdir}/libtdeinit_kview.so
%{tde_libdir}/libkimageviewer.so.* %{tde_libdir}/libkimageviewer.so.*
%{tde_tdelibdir}/libphotobook.la %{tde_tdelibdir}/libphotobook.la
%{tde_tdelibdir}/libphotobook.so %{tde_tdelibdir}/libphotobook.so
@ -1181,8 +1181,8 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
%{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h %{tde_tdeincludedir}/libtext2path-0.1/BezierPath.h
%{tde_tdeincludedir}/libtext2path-0.1/Glyph.h %{tde_tdeincludedir}/libtext2path-0.1/Glyph.h
%{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h %{tde_tdeincludedir}/libtext2path-0.1/GlyphTracer.h
%{tde_libdir}/lib[kt]deinit_kview.la %{tde_libdir}/libtdeinit_kview.la
%{tde_libdir}/lib[kt]deinit_mrmlsearch.la %{tde_libdir}/libtdeinit_mrmlsearch.la
%{tde_libdir}/libkghostviewlib.la %{tde_libdir}/libkghostviewlib.la
%{tde_libdir}/libkghostviewlib.so %{tde_libdir}/libkghostviewlib.so
%{tde_libdir}/libkimageviewer.la %{tde_libdir}/libkimageviewer.la
@ -1213,8 +1213,8 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
#%exclude %{tde_bindir}/kuickshow #%exclude %{tde_bindir}/kuickshow
#%exclude %{tde_tdelibdir}/kuickshow.la #%exclude %{tde_tdelibdir}/kuickshow.la
#%exclude %{tde_tdelibdir}/kuickshow.so #%exclude %{tde_tdelibdir}/kuickshow.so
#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la #%exclude %{tde_libdir}/libtdeinit_kuickshow.la
#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so #%exclude %{tde_libdir}/libtdeinit_kuickshow.so
#%exclude %{tde_tdeappdir}/kuickshow.desktop #%exclude %{tde_tdeappdir}/kuickshow.desktop
#%exclude %{tde_datadir}/apps/kuickshow/ #%exclude %{tde_datadir}/apps/kuickshow/
#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png #%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
@ -1318,5 +1318,5 @@ done
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE R14.0.0

@ -1,3 +1,5 @@
# Remove qt-devel and qt3-devel and any kde*-devel that may interfere !!!
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%define _variant .opt %define _variant .opt

@ -52,17 +52,15 @@ Provides: trinity-kdemultimedia-extras-libs = %{version}-%{release}
BuildRequires: autoconf automake libtool m4 BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-tqt3-devel >= %{version} BuildRequires: trinity-tqt3-devel >= 3.5.0
BuildRequires: trinity-tqtinterface-devel >= %{version} BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-arts-devel >= %{version} BuildRequires: trinity-arts-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version} BuildRequires: trinity-tdelibs-devel >= %{version}
%if "%{?_with_akode}" != "" %if "%{?_with_akode}" != ""
BuildRequires: trinity-akode-devel BuildRequires: trinity-akode-devel
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
BuildRequires: trinity-akode-libmad BuildRequires: trinity-akode-libmad
%endif %endif
%endif
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: zlib-devel BuildRequires: zlib-devel

@ -76,7 +76,6 @@ BuildRequires: sqlite3-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
%endif %endif
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
BuildRequires: libxtst-devel
# GADU support # GADU support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
@ -91,6 +90,10 @@ BuildRequires: libXtst-devel
BuildRequires: libXxf86vm-devel BuildRequires: libXxf86vm-devel
%endif %endif
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
BuildRequires: libxtst-devel
%endif
# Wifi support # Wifi support
%if "%{?_with_wifi:1}" == "1" %if "%{?_with_wifi:1}" == "1"
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
@ -153,9 +156,9 @@ BuildRequires: meanwhile-devel
%endif %endif
# ORTP support # ORTP support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 #%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: ortp-devel #BuildRequires: ortp-devel
%endif #%endif
# SPEEX support # SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
@ -257,6 +260,7 @@ update-desktop-database 2> /dev/null || :
%package devel %package devel
Summary: Development files for the Trinity network module Summary: Development files for the Trinity network module
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: trinity-kdict = %{version}-%{release} Requires: trinity-kdict = %{version}-%{release}
Requires: trinity-kopete = %{version}-%{release} Requires: trinity-kopete = %{version}-%{release}
Requires: trinity-ksirc = %{version}-%{release} Requires: trinity-ksirc = %{version}-%{release}
@ -1193,5 +1197,5 @@ EOF
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0 - Initial release for TDE 14.0.0

@ -18,7 +18,7 @@
Name: trinity-tdesdk Name: trinity-tdesdk
Summary: The KDE Software Development Kit (SDK) Summary: The Trinity Software Development Kit (SDK)
Version: 14.0.0 Version: 14.0.0
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
@ -1148,15 +1148,11 @@ fi
# Removes useless stuff # Removes useless stuff
%__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules %__rm -f %{?buildroot}%{tde_datadir}/apps/kapptemplate/admin/debianrules
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE 14.0.0
* Wed Nov 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
- Fix various cmake issues [Bug #1262]

@ -1088,5 +1088,5 @@ fi
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE 14.0.0

@ -628,5 +628,5 @@ cd ..
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE 14.0.0

@ -467,6 +467,7 @@ Obsoletes: trinity-kdewebdev-devel < %{version}-%{release}
Provides: trinity-kdewebdev-devel = %{version}-%{release} Provides: trinity-kdewebdev-devel = %{version}-%{release}
Requires: trinity-tdelibs-devel Requires: trinity-tdelibs-devel
Requires: %{name} = %{version}-%{release}
Requires: trinity-kommander-devel = %{version}-%{release} Requires: trinity-kommander-devel = %{version}-%{release}
%description devel %description devel
@ -566,5 +567,5 @@ popd
%changelog %changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 * Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 3.5.13.2 - Initial release for TDE 14.0.0

Loading…
Cancel
Save