RPM Packaging: remove old redhat macros

pull/3/head
François Andriot 11 years ago
parent a28a81a1e4
commit 700ec26353

@ -120,33 +120,13 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
## File lists
%find_lang gwenview
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> gwenview.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Removes useless files (-devel ?)
%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
%clean
%__rm -rf %{buildroot}
@ -158,6 +138,7 @@ for f in crystalsvg hicolor ; do
done
/sbin/ldconfig
%postun
for f in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
@ -165,9 +146,22 @@ for f in crystalsvg hicolor ; do
done
/sbin/ldconfig
%files -f gwenview.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO
%lang(da) %{tde_tdedocdir}/HTML/da/gwenview/
%lang(de) %{tde_tdedocdir}/HTML/de/gwenview/
%lang(et) %{tde_tdedocdir}/HTML/et/gwenview/
%lang(fr) %{tde_tdedocdir}/HTML/fr/gwenview/
%lang(it) %{tde_tdedocdir}/HTML/it/gwenview/
%lang(nl) %{tde_tdedocdir}/HTML/nl/gwenview/
%lang(pl) %{tde_tdedocdir}/HTML/pl/gwenview/
%lang(pt) %{tde_tdedocdir}/HTML/pt/gwenview/
%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/gwenview/
%lang(ru) %{tde_tdedocdir}/HTML/ru/gwenview/
%lang(sv) %{tde_tdedocdir}/HTML/sv/gwenview/
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.2-3

@ -117,29 +117,10 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Removes useless files (-devel ?)
%__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
%clean
%__rm -rf %{buildroot}
@ -151,6 +132,7 @@ for f in crystalsvg hicolor ; do
done
/sbin/ldconfig
%postun
for f in crystalsvg hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} || :
@ -158,6 +140,7 @@ for f in crystalsvg hicolor ; do
done
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING

@ -241,22 +241,6 @@ export PATH="%{tde_bindir}:${PATH}"
## File lists
# locale's
%find_lang %{tde_pkg}
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la

@ -1,11 +0,0 @@
--- trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am.ORI 2013-07-07 13:17:16.270257111 +0200
+++ trinity-kbiff-14.0.0~pre6+b63c54d4/kbiff/Makefile.am 2013-07-07 13:17:41.911536825 +0200
@@ -24,7 +24,7 @@
# the libraries to link against. Be aware of the order. First the libraries,
# that depend on the following ones.
-kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO)
+kbiff_la_LIBADD = $(LIB_KFILE) $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI)
# this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = setupdlg.h kbiff.h kbiffmonitor.h notify.h kbiffurl.h \

@ -34,7 +34,6 @@ URL: http://sourceforge.net/projects/knmap/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: kbiff-14.0.0-ftbfs.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -55,7 +54,6 @@ NNTP mailboxes.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
%__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/ltmain.sh" "admin/ltmain.sh"

@ -91,26 +91,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot}
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}

@ -38,9 +38,7 @@ URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source0: kdbg-master.tar.gz
Source1: admin-master.tar.gz
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -80,10 +78,7 @@ Features include the following:
##########
%prep
#setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%setup -q -a 1 -n kdbg-master
rmdir admin
mv admin-master admin
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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/ltmain.sh" "admin/ltmain.sh"

@ -93,25 +93,7 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
## File lists
# locale's
%find_lang %{tde_pkg}
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%clean

@ -154,27 +154,9 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%find_lang kmymoney2
%clean
%__rm -rf %{buildroot}

@ -81,31 +81,10 @@ export PATH="%{tde_bindir}:${PATH}"
%__make install DESTDIR=%{buildroot}
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{tde_bindir}/kstreamripper

@ -93,33 +93,13 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%find_lang %{tde_pkg}
%clean
%__rm -rf %{buildroot}
%files -f %{tde_pkg}.lang
%defattr(-,root,root,-)
%{tde_bindir}/tdesudo

@ -483,23 +483,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# file lists for locale
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}

@ -724,23 +724,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# File lists for locale
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}

@ -437,23 +437,6 @@ comps="kcron kdat knetworkconf kpackage ksysv kuser"
%endif
%endif
# locale's
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}/$HTML_DIR ]; then
for lang_dir in %{buildroot}/$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
# rpmdocs
for dir in $comps ; do
for file in AUTHORS ChangeLog README TODO ; do
@ -480,5 +463,5 @@ done
%changelog
* Fri Jun 28 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE R14.0.0

@ -683,25 +683,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install -C build DESTDIR=%{buildroot}
# webcollage -root -directory /usr/share/backgrounds/images #227683
# File lists
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Duplicate with trinity-kbabel (from tdesdk)
%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/16x16/apps/kbabel.png
%__rm -f %{?buildroot}%{tde_datadir}/icons/locolor/32x32/apps/kbabel.png

@ -1068,24 +1068,6 @@ export PATH="%{tde_bindir}:${PATH}"
find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
# locale's
%find_lang %{name} || touch %{name}.lang
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
# Installs juic
%__install -D -m 755 qtjava/designer/juic/bin/juic %{?buildroot}%{tde_bindir}/juic
%__install -d -m 755 %{?buildroot}%{tde_datadir}/juic/common

@ -1358,28 +1358,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# locale's
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}
%changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE R14.0.0

@ -1566,23 +1566,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
# locale's
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
%clean
%__rm -rf %{buildroot}

@ -1285,23 +1285,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
# locale's
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
# rpmdocs
for dir in k* ; do
for file in AUTHORS ChangeLog README TODO ; do

@ -77,6 +77,13 @@ BuildRequires: glib2-devel
# LIBART_LGPL support
BuildRequires: trinity-libart-lgpl-devel
# ELFICON support
# It's an Ubuntu gadget, not useful for us.
%if 0
%define with_elficon 1
BuildRequires: libr-devel
%endif
# ASPELL support
BuildRequires: aspell
BuildRequires: aspell-devel
@ -111,6 +118,7 @@ BuildRequires: libudev-devel
# UDISKS support
Requires: udisks
Requires: pmount
BuildRequires: udisks-devel
# UDISKS2 support
@ -237,7 +245,7 @@ Requires: trinity-arts >= %{tde_version}
%description
Libraries for the Trinity Desktop Environment:
TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
kfm (file manager), khtmlw (HTML widget), tdeio (Input/Output, networking),
kspell (spelling checker), jscript (javascript), kab (addressbook),
kimgio (image manipulation).
@ -284,6 +292,9 @@ kimgio (image manipulation).
%{tde_bindir}/tdeioexec
%{tde_bindir}/tdeioslave
%{tde_bindir}/tdelauncher
%if 0%{?with_elficon}
%{tde_bindir}/tdelfeditor
%endif
%{tde_bindir}/tdemailservice
%{tde_bindir}/tdemimelist
%attr(4755,root,root) %{tde_bindir}/kpac_dhcp_helper
@ -403,7 +414,7 @@ applications for TDE.
%build
unset QTDIR
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
@ -430,6 +441,7 @@ cd build
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DCMAKE_SKIP_RPATH=OFF \
-DWITH_ALL_OPTIONS=ON \
-DWITH_ARTS=ON \
-DWITH_ALSA=ON \
-DWITH_LIBART=ON \
@ -441,20 +453,20 @@ cd build
%{?with_jasper:-DWITH_JASPER=ON} \
%{?with_openexr:-DWITH_OPENEXR=ON} \
-DWITH_UTEMPTER=ON \
-DWITH_ELFICON=OFF \
%{?!with_elficon:-DWITH_ELFICON=OFF} \
%{?with_avahi:-DWITH_AVAHI=ON} \
%{?!with_pcre:-DWITH_PCRE=OFF} \
-DWITH_GCC_VISIBILITY=ON \
%{?!with_inotify:-DWITH_INOTIFY=OFF} \
%{?!with_gamin:-DWITH_GAMIN=OFF} %{?with_gamin:-DWITH_GAMIN=ON} \
%{?!with_gamin:-DWITH_GAMIN=OFF} \
-DWITH_UPOWER=ON \
-DWITH_UDISKS=ON \
%{?with_udisks2:-DWITH_UDISKS2=ON} %{?!with_udisks2:-DWITH_UDISKS2=OFF} \
%{?!with_udisks2:-DWITH_UDISKS2=OFF} \
-DWITH_CONSOLEKIT=ON \
%{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \
-DWITH_SUDO_TDESU_BACKEND=OFF \
-DWITH_OLD_XDG_STD=OFF \
%{?with_lzma:-DWITH_LZMA=ON} %{?!with_lzma:-DWITH_LZMA=OFF} \
%{?!with_lzma:-DWITH_LZMA=OFF} \
-DWITH_ASPELL=ON \
%{?with_hspell:-DWITH_HSPELL=ON} \
..

@ -564,8 +564,8 @@ This package provides data on multimedia applications for kappfinder.
%files kappfinder-data
%defattr(-,root,root,-)
%{tde_datadir}/apps/kappfinder/*
%{tde_datadir}/desktop-directories/[kt]de-multimedia-music.directory
%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
%{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
##########
@ -671,8 +671,8 @@ This package includes TDE's dockable sound mixer applet.
%{tde_tdelibdir}/kmix_panelapplet.so
%{tde_tdelibdir}/kmixctrl.la
%{tde_tdelibdir}/kmixctrl.so
%{tde_libdir}/lib[kt]deinit_kmix.so
%{tde_libdir}/lib[kt]deinit_kmixctrl.so
%{tde_libdir}/libtdeinit_kmix.so
%{tde_libdir}/libtdeinit_kmixctrl.so
%{tde_tdeappdir}/kmix.desktop
%{tde_datadir}/apps/kicker/applets/kmixapplet.desktop
%{tde_datadir}/apps/kmix/
@ -725,7 +725,7 @@ This is a sound recording utility for Trinity.
%{tde_tdelibdir}/libkrecexport_ogg.so
%{tde_tdelibdir}/libkrecexport_wave.la
%{tde_tdelibdir}/libkrecexport_wave.so
%{tde_libdir}/lib[kt]deinit_krec.so
%{tde_libdir}/libtdeinit_krec.so
%{tde_tdeappdir}/krec.desktop
%{tde_datadir}/apps/krec/
%{tde_datadir}/icons/hicolor/*/apps/krec.png
@ -1020,7 +1020,7 @@ formats supported by your installation of aRts (including aRts plugins).
%{tde_tdelibdir}/noatunsimple.so
%{tde_libdir}/libartseffects.la
%{tde_libdir}/libartseffects.so
%{tde_libdir}/lib[kt]deinit_noatun.so
%{tde_libdir}/libtdeinit_noatun.so
%{tde_libdir}/libnoatun.so.*
%{tde_libdir}/libnoatunarts.la
%{tde_libdir}/libnoatunarts.so
@ -1105,10 +1105,10 @@ noatun plugins.
%{tde_libdir}/libaudiocdplugins.so
%{tde_libdir}/libkcddb.la
%{tde_libdir}/libkcddb.so
%{tde_libdir}/lib[kt]deinit_kmix.la
%{tde_libdir}/lib[kt]deinit_kmixctrl.la
%{tde_libdir}/lib[kt]deinit_krec.la
%{tde_libdir}/lib[kt]deinit_noatun.la
%{tde_libdir}/libtdeinit_kmix.la
%{tde_libdir}/libtdeinit_kmixctrl.la
%{tde_libdir}/libtdeinit_krec.la
%{tde_libdir}/libtdeinit_noatun.la
%{tde_libdir}/libtdemidlib.la
%{tde_libdir}/libtdemidlib.so
%{tde_libdir}/libmpeg.la
@ -1181,7 +1181,7 @@ fi
%{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
%{?_with_taglib} %{!?_with_taglib:--without-taglib} \
%{?with_xine:--with-xine} %{!?with_xine:--without-xine} \
--with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
--with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
--enable-closure
%__make %{?_smp_mflags}
@ -1195,29 +1195,6 @@ export PATH="%{tde_bindir}:${PATH}"
# don't make these world-writeable
chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
# locale's
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
# Moves the XDG configuration files to TDE directory
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu" \
"%{?buildroot}%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
%clean
%__rm -rf %{buildroot}

@ -49,8 +49,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kppp.pamd
Source2: ktalk
Source4: lisarc
Source5: lisa.redhat
# RedHat/Fedora legacy patches
Patch4: kdenetwork-3.2.3-resolv.patch
@ -495,7 +493,7 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kopete
Summary: instant messenger for Trinity
Summary: instant gwenview-i18n/gwenview-i18n-14.0.0.spec:HTML_DIRmessenger for Trinity
Group: Applications/Internet
URL: http://kopete.kde.org
@ -993,13 +991,6 @@ automatically when needed.
%package -n trinity-lisa
Summary: LAN information server for Trinity
Group: Applications/Internet
%if 0%{?suse_version}
Requires(preun): aaa_base
Requires(post): aaa_base
%else
Requires(preun): chkconfig
Requires(post): chkconfig
%endif
%description -n trinity-lisa
LISa is intended to provide TDE with a kind of "network neighborhood"
@ -1007,8 +998,6 @@ but relying only on the TCP/IP protocol.
%files -n trinity-lisa
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/lisarc*
%config(noreplace) %{_initrddir}/lisa
%{tde_tdelibdir}/kcm_lanbrowser.la
%{tde_tdelibdir}/kcm_lanbrowser.so
%{tde_tdelibdir}/tdeio_lan.la
@ -1028,20 +1017,15 @@ but relying only on the TCP/IP protocol.
%{tde_bindir}/reslisa
%post -n trinity-lisa
/sbin/chkconfig --add lisa ||:
update-desktop-database 2> /dev/null || :
%postun -n trinity-lisa
if [ $1 -eq 0 ]; then
/sbin/service lisa stop > /dev/null 2>&1 ||:
/sbin/chkconfig --del lisa ||:
fi
update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kdnssd
Summary: Zeroconf support for KDE
Summary: Zeroconf support for TDE
Group: Applications/Internet
%description -n trinity-kdnssd
@ -1137,26 +1121,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
%if 0%{?with_consolehelper}
# Run kppp through consolehelper, and rename it to 'kppp3'
%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
@ -1179,10 +1143,6 @@ EOF
# ktalk
%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
# Add lisa startup script
%__install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
%__install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa
# RHEL 5: Avoids conflict with 'kdenetwork'
%if 0%{?rhel} == 5
%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde

@ -3,6 +3,8 @@
%define _variant .opt
%endif
%define tde_version 14.0.0
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@ -34,10 +36,11 @@ URL: http://www.trinitydesktop.org/
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf automake libtool m4
BuildRequires: cmake >= 2.8
BuildRequires: desktop-file-utils
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= %{tde_version}
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: gettext
Obsoletes: trinity-kdetoys < %{version}-%{release}
@ -68,7 +71,7 @@ Includes:
* kworldwatch: application and kicker applet showing daylight area on the world
globe
NOTE: kicker applets and screen savers require kdebase to be installed,
NOTE: kicker applets and screen savers require tdebase to be installed,
and user to be logged-in to TDE.
%files
@ -85,8 +88,8 @@ Group: Amusements/Graphics
AMOR stands for Amusing Misuse Of Resources. It provides several different
characters who prance around your X screen doing tricks and giving you tips.
Note that AMOR will only work with some window managers. Both KWin (the
KDE window manager) and Metacity (a GTK2 window manager) are supported.
Note that AMOR will only work with some window managers. Both TWin (the
TDE window manager) and Metacity (a GTK2 window manager) are supported.
This package is part of Trinity, and a component of the TDE toys module.
@ -116,7 +119,7 @@ Summary: eyes applet for Trinity
Group: Amusements/Graphics
%description -n trinity-eyesapplet
An applet for the KDE panel containing a pair of eyes that follow your mouse
An applet for the TDE panel containing a pair of eyes that follow your mouse
around the screen.
This package is part of Trinity, and a component of the TDE toys module.
@ -135,7 +138,7 @@ Summary: fifteen pieces puzzle for Trinity
Group: Amusements/Graphics
%description -n trinity-fifteenapplet
An applet for the KDE panel that lets you play the Fifteen Pieces
An applet for the TDE panel that lets you play the Fifteen Pieces
sliding block puzzle. You have to order 15 pieces in a 4x4 square by
moving them around.
@ -155,7 +158,7 @@ Summary: moon phase indicator for Trinity
Group: Amusements/Graphics
%description -n trinity-kmoon
An applet for the KDE panel that displays the current phase of the moon.
An applet for the TDE panel that displays the current phase of the moon.
This package is part of Trinity, and a component of the TDE toys module.
@ -224,7 +227,7 @@ drink.
KTeaTime sits in the Trinity system tray.
Please note that KTeaTime is written explicitly for Trinity. If you are
using a non-KDE window manager or desktop environment then it is quite
using a non-TDE window manager or desktop environment then it is quite
possible that KTeaTime will not work on your system.
This package is part of Trinity, and a component of the TDE toys module.
@ -255,7 +258,7 @@ Summary: Tux screensaver for Trinity
Group: Amusements/Graphics
%description -n trinity-ktux
A neat Tux-in-a-spaceship screensaver for the K Desktop Environment (KDE).
A neat Tux-in-a-spaceship screensaver for the Trinity Desktop Environment (TDE).
This package is part of Trinity, and a component of the TDE toys module.
@ -282,7 +285,7 @@ Summary: weather display applet for Trinity
Group: Amusements/Graphics
%description -n trinity-kweather
An applet for the KDE panel that displays your area's current weather.
An applet for the TDE panel that displays your area's current weather.
Information shown includes the temperature, wind speed, air pressure
and more. By pressing a button a full weather report can be obtained.
@ -336,7 +339,7 @@ Group: Amusements/Graphics
%description -n trinity-kworldclock
Displays where in the world it is light and dark depending on time, as
well as offering the time in all of the major cities of the world.
This can be run standalone, as an applet in the KDE panel or as a
This can be run standalone, as an applet in the TDE panel or as a
desktop background.
Additional kworldclock themes are available in the tdeartwork-misc package.
@ -377,28 +380,28 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%__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/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
--disable-rpath \
--enable-new-ldflags \
--enable-closure \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build
cd build
%endif
%cmake \
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-DBIN_INSTALL_DIR="%{tde_bindir}" \
-DDOC_INSTALL_DIR="%{tde_docdir}" \
-DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \
-DLIB_INSTALL_DIR="%{tde_libdir}" \
-DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
-DCMAKE_SKIP_RPATH=OFF \
-DBUILD_ALL=ON \
..
%__make %{?_smp_mflags}
@ -406,28 +409,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf "%{buildroot}"
%__make install DESTDIR=%{buildroot}
# replace absolute symlink with relative
ln -nfs tips-en %{buildroot}%{tde_datadir}/apps/amor/tips
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
done
popd
fi
done
fi
%__make install DESTDIR=%{buildroot} -C build
# Useless include file from Amor
%__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h
@ -438,6 +420,5 @@ fi
%changelog
* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
- Initial release for TDE 3.5.13.2
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
- Initial release for TDE 14.0.0

@ -1027,31 +1027,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
## File lists
# HTML (1.0)
HTML_DIR=$(tde-config --expandvars --install html)
if [ -d %{buildroot}$HTML_DIR ]; then
for lang_dir in %{buildroot}$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
pushd $lang_dir/kcontrol
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../../common $i/common
done
popd
fi
done
fi
%if 0%{?build_klaptopdaemon}
### Use consolehelper for 'klaptop_acpi_helper'
%if 0%{?with_consolehelper}
@ -1074,7 +1049,7 @@ fi
%else
# Klaptop's documentation is installed even if we did not build it ...
# Klaptop's documentation is installed even if we did not build the program ...
%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatcrit/
%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/kcmlowbatwarn/
%__rm -fr %{?buildroot}%{tde_tdedocdir}/HTML/en/kcontrol/laptop/

Loading…
Cancel
Save