RPM: updates for Mageia 6

pull/3/head
François Andriot 8 years ago
parent f5fb93e00b
commit 608d97009e

@ -268,8 +268,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
endif
torsocks:
# Do NOT build on RHEL 6, RHEL 7, Fedora > 20
ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2*),)
# Do NOT build on RHEL 6, RHEL 7, Fedora > 20, Mageia
ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2* /boot/mageia.dat/boot/mageia.dat),)
$(call buildpkg,3rdparty/torsocks)
endif

@ -196,7 +196,11 @@ BuildRequires: libmad-devel
%if 0%{?pclinuxos}
BuildRequires: liblame-devel
%else
BuildRequires: %{_lib}lame-devel
%if 0%{?mgaversion} >= 6
BuildRequires: %{_lib}mp3lame-devel
%else
BuildRequires: %{_lib}lame-devel
%endif
%endif
%endif
%if 0%{?suse_version}

@ -164,9 +164,13 @@ BuildRequires: libxine-devel
%if 0%{?pclinuxos}
BuildRequires: liblame-devel
%else
%if 0%{?mgaversion} >= 6
BuildRequires: %{_lib}mp3lame-devel
%else
BuildRequires: %{_lib}lame-devel
%endif
%endif
%endif
%if 0%{?suse_version}
BuildRequires: libmp3lame-devel
%endif

@ -1,69 +0,0 @@
--- kcmautostart/src/autostart.desktop.ORI 2012-05-10 11:47:47.743164035 +0200
+++ kcmautostart/src/autostart.desktop 2012-05-10 11:49:15.127289325 +0200
@@ -14,8 +14,10 @@
Comment=A KControl tool for managing what programs start up with TDE.
Comment[ca]=Panell de control per a gestionar els programes que s'inicien amb la sessió de TDE.
Comment[es]=Panel de control para gestionar los programas que se inician con la sesión de TDE.
+Comment[fr]=Paneau de contrôle pour gérer le démarrage des programmes à l'ouverture de session TDE.
Keywords=autostart manager
Name=Autostart Manager
Name[ca]=Autoengega
Name[es]=Arranque automático
+Name[fr]=Démarrage automatique
Categories=Qt;KDE;X-KDE-settings-components;
diff -Nuar kcmautostart/po.ori//fr.po kcmautostart/po/fr.po
--- kcmautostart/po.ori//fr.po 1970-01-01 01:00:00.000000000 +0100
+++ kcmautostart/po/fr.po 2012-05-10 19:27:38.107215981 +0200
@@ -0,0 +1,52 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"PO-Revision-Date: 2012-05-10 12:01+0100\n"
+"Project-Id-Version: autostart_ca\n"
+"Language-Team: <ca@li.org>\n"
+"X-Generator: KBabel 1.11.4\n"
+"MIME-Version: 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Last-Translator: Josep Febrer <josep@extens.info>\n"
+
+#: ../src/autostart.cpp:61
+msgid "Startup"
+msgstr "Démarrage"
+
+#: ../src/autostart.cpp:62
+msgid "Shutdown"
+msgstr "Arrêt"
+
+#: ../src/autostart.cpp:63
+msgid "ENV"
+msgstr "ENV"
+
+#: ../src/autostart.cpp:102
+msgid "Name"
+msgstr "Nom"
+
+#: ../src/autostart.cpp:103
+msgid "Command"
+msgstr "Commande"
+
+#: ../src/autostart.cpp:104
+msgid "Run on"
+msgstr "Executer"
+
+#: ../src/autostart.cpp:129
+msgid "&Add"
+msgstr "&Ajouter"
+
+#: ../src/autostart.cpp:131
+msgid "&Remove"
+msgstr "&Supprimer"
+
+#: ../src/autostart.cpp:133
+msgid "&Properties"
+msgstr "&Propiétés"
+
+#: ../src/autostart.cpp:317
+msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
+msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
+

@ -1,14 +0,0 @@
--- kcmautostart/src/autostart.cpp.crash_on_exit 2013-05-10 23:35:31.443410887 +0200
+++ kcmautostart/src/autostart.cpp 2013-05-10 23:46:31.852926622 +0200
@@ -102,7 +102,10 @@
if (bisDesktop) service = new KService( fileName.path() );
}
~desktop() {
- delete service;
+ if(service) {
+ service = NULL;
+ delete service;
+ }
}
};

@ -1,11 +0,0 @@
--- kcmautostart/po/fr.po.ORI 2013-05-10 23:28:02.181493730 +0200
+++ kcmautostart/po/fr.po 2013-05-10 23:28:09.944336813 +0200
@@ -44,7 +44,7 @@
#: ../src/autostart.cpp:133
msgid "&Properties"
-msgstr "&Propiétés"
+msgstr "&Propriétés"
#: ../src/autostart.cpp:317
msgid "This module helps you configure which applications KDE runs When starting up and shutting down."

@ -1,67 +0,0 @@
--- kcmautostart.ORI/src/autostart.cpp 2012-05-10 11:36:44.887288951 +0200
+++ kcmautostart.P/src/autostart.cpp 2012-05-10 11:37:16.701639283 +0200
@@ -88,10 +88,10 @@
path = kgs->autostartPath()+"/";
break;
case Shutdown:
- path = ksd->localtdedir()+"shutdown/";
+ path = ksd->localkdedir()+"shutdown/";
break;
case ENV:
- path = ksd->localtdedir()+"env/";
+ path = ksd->localkdedir()+"env/";
break;
}
KIO::file_move(fileName, KURL( path + fileName.fileName() ));
@@ -190,9 +190,9 @@
if (x==0)
path = kgs->autostartPath();
else if (x==1)
- path = ksd->localtdedir() + "/shutdown";
+ path = ksd->localkdedir() + "/shutdown";
else if (x==2)
- path = ksd->localtdedir() + "/env";
+ path = ksd->localkdedir() + "/env";
if (! KStandardDirs::exists(path))
KStandardDirs::makeDir(path);
--- kcmautostart/admin/cvs.sh.ftbfs 2012-05-10 11:30:01.000000000 +0200
+++ kcmautostart/admin/cvs.sh 2013-06-04 21:27:13.097359615 +0200
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
@@ -128,7 +128,7 @@
echo "*** Creating configure"
call_and_fix_autoconf
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in
@@ -184,7 +184,7 @@
fi
fi
$ACLOCAL $ACLOCALFLAGS
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in
--- kcmautostart/admin/configure.in.min.ORI 2013-06-04 21:28:06.399273569 +0200
+++ kcmautostart/admin/configure.in.min 2013-06-04 21:28:12.584147551 +0200
@@ -41,7 +41,7 @@
KDE_SET_PREFIX
dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_PROG_CC

@ -81,6 +81,9 @@ BuildRequires: brp-check-trinity
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
BuildRequires: openldap-devel
%endif
%if 0%{?mgaversion} >= 6
BuildRequires: openldap-servers-devel
%endif
%if 0%{?suse_version}
BuildRequires: openldap2-devel
%endif

@ -1,11 +0,0 @@
--- kvirc/src/kvirc/build/Makefile.am.ORI 2011-11-26 22:37:04.065565368 +0100
+++ kvirc/src/kvirc/build/Makefile.am 2011-11-26 22:37:17.139565032 +0100
@@ -8,7 +8,7 @@
AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \
$(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
-kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH)
+kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio -lkdecore -lkdeui
kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
bin_PROGRAMS = kvirc

@ -1,11 +0,0 @@
--- trinity-kvirc-3.5.13.2/configure.in.ORI 2013-06-04 00:16:19.407990544 +0200
+++ trinity-kvirc-3.5.13.2/configure.in 2013-06-04 00:16:26.428844196 +0200
@@ -20,7 +20,7 @@
AM_MAINTAINER_MODE
AC_PREFIX_DEFAULT(/usr/local)
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADER(src/config.h)
#------------------------------------------------------------------
# HERE starts your real configure script

@ -1,15 +0,0 @@
--- trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in.ROI 2013-08-04 20:37:52.076477391 +0200
+++ trinity-kvirc-14.0.0~pre102+3e8fea2e/admin/acinclude.m4.in 2013-08-04 20:37:57.402529614 +0200
@@ -2603,10 +2603,10 @@
helpdir="\${globalkvircdir}/help/en"
AC_SUBST(helpdir)
- pluglibdir="\${globalkvircdir}/modules"
+ pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
AC_SUBST(pluglibdir)
- modulelibdir="\${globalkvircdir}/modules"
+ modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
AC_SUBST(modulelibdir)
defscriptdir="\${globalkvircdir}/defscript"

@ -12,7 +12,7 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}")
VERSION=${VERSION%.opt}
VERSION=${VERSION%.[a-z]*}
VERSION=${VERSION/-*_/\~}
VERSION=${VERSION/-*_0/\~}
echo $VERSION

@ -10,13 +10,13 @@ RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
# If package version contains a "~": it's a pre-release
if [ "${BUILT/\~/}" != "${BUILT}" ]; then
if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then
echo "Latest package '${PKGNAME}' version '${BUILT}' is already built."
echo "Latest development package '${PKGNAME}' version '${BUILT}' is already built."
exit 0
fi
# Nominal case: no "~" caracter
else
if [ "${TARBALL%-*}" = "${BUILT%-*}" ]; then
echo "Latest package '${PKGNAME}' version '${BUILT}' is already built."
if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then
echo "Latest stable package '${PKGNAME}' version '${BUILT}' is already built."
exit 0
fi
fi

@ -64,6 +64,7 @@ This utility was originally written for openSUSE KDE3.
%prep
%setup -q -n fileshareset2
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
aclocal
autoconf
automake -a -c
@ -73,8 +74,8 @@ automake -a -c
export CXXFLAGS="$CXXFLAGS -fPIE"
export CFLAGS="$CFLAGS -fPIE"
export LDFLAGS="$LDFLAGS -pie"
%configure
%__make %{?_smp_mflags}
%configure --disable-dependency-tracking
%__make %{?_smp_mflags} || %__make
%install

@ -3363,8 +3363,12 @@ EXEC=%{tde_bindir}/%{tdm}
%if 0%{?pclinuxos}
FNDSESSION_EXEC="/usr/sbin/chksession -k"
%else
%if 0%{?mgaversion} >= 6
FNDSESSION_EXEC="/usr/sbin/chksession"
%else
FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
%endif
%endif
EOF
%endif

@ -181,7 +181,12 @@ BuildRequires: rubypick
%if "%{?rb_archdir}" != ""
%define ruby_arch %{?rb_archdir}
%else
%if "%{%ruby_archdir}" != ""
%define ruby_arch %{?ruby_archdir}
%else
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
%endif
%endif
%endif

@ -194,9 +194,13 @@ BuildRequires: libxine-devel
%if 0%{?pclinuxos}
BuildRequires: liblame-devel
%else
%if 0%{?mgaversion} >= 6
BuildRequires: %{_lib}mp3lame-devel
%else
BuildRequires: %{_lib}lame-devel
%endif
%endif
%endif
%if 0%{?suse_version}
BuildRequires: libmp3lame-devel
@ -1110,7 +1114,7 @@ export PATH="%{tde_bindir}:${PATH}"
%endif
# Copy missing icons from 'crystalsvg' theme (tdelibs)
%__mkdir_p "%{?buildroot}{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/"
%__mkdir_p "%{?buildroot}%{tde_datadir}/icons/hicolor/"{16x16,22x22,32x32,48x48,64x64}"/apps/"
pushd $RPM_BUILD_ROOT%{tde_datadir}/icons/
for i in {16,22,32,48,64}; do %__cp %{tde_datadir}/icons/crystalsvg/"$i"x"$i"/devices/media-optical-cdaudio.png hicolor/"$i"x"$i"/apps/kcmaudiocd.png; done
popd

File diff suppressed because it is too large Load Diff

@ -0,0 +1 @@
tdemultimedia-14.0.0-cmake.spec

@ -1,180 +0,0 @@
GraphicsMagick-devel
ImageMagick-devel
NetworkManager-glib-devel
OpenEXR-devel
SDL-devel
alsa-lib-devel
aspell
aspell-devel
audiofile-devel
autotrace
avahi-devel
bind-devel
binutils-devel
bison
boost-devel
bzip2-devel
ccache
cdparanoia
cdparanoia-devel
chrpath
clucene-core-devel
cmake
cpp
cppunit-devel
createrepo
cups-devel
libdb-cxx-devel
dbus-glib-devel
djvulibre
djvulibre-devel
doxygen
emacs
exiv2-devel
fdupes
ffmpeg-devel
fftw-devel
file-devel
flac-devel
flex-devel
fontpackages-devel
fribidi-devel
gamin-devel
gcc
gcc-c++
gcc-gfortran
gettext-devel
glib-devel
gmp-devel
gperf
gpgme-devel
gphoto2-devel
gsl-devel
gstreamer-devel
gstreamer-plugins-base-devel
gtk+-devel
gtk-doc
gtk2-devel
guile-devel
hspell-devel
html2ps
icu
imake
imlib-devel
jack-audio-connection-kit-devel
jasper-devel
java-1.7.0-openjdk-devel
java-devel
java-openjdk
lame-devel
libXScrnSaver-devel
libXaw-devel
libXcomposite-devel
libXdamage-devel
libXdmcp-devel
libXtst-devel
libXv-devel
libXxf86dga-devel
libXxf86vm-devel
libacl-devel
libarchive-devel
libart_lgpl-devel
libblkid-devel
libcap-devel
libcdio-devel
libcdio-paranoia-devel
libconfig-devel
libcurl-devel
libdvdread-devel
libfontenc-devel
libgpod-devel
libgsf-devel
libical-devel
libidn-devel
libmad-devel
libmng-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libofx-devel
libogg-devel
libotr-devel
libpaper-devel
libraw1394-devel
libsamplerate-devel
libsmbclient-devel
libsndfile-devel
libssh2-devel
libtheora-devel
libtiff-devel
libtool
libtool-ltdl-devel
systemd-devel
libutempter-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libxkbfile-devel
libxslt-devel
lm_sensors-devel
meanwhile-devel
mysql-devel
neon-devel
net-snmp-devel
net-tools
netpbm-progs
ocaml
ocaml(compiler)
openldap-devel
openslp-devel
opensp-devel
pam-devel
pciutils-devel
pcre-devel
pcsc-lite-devel
perl
perl(ExtUtils::MakeMaker)
perl(XML::Parser)
perl-devel
poppler-devel
postgresql-devel
pth-devel
pulseaudio-libs-devel
recode
redhat-rpm-config
rpm-build
ruby
ruby-devel
sane-backends-devel
scons
sip-devel
speex-devel
sqlite-devel
subversion-devel
t1lib-devel
t1utils
taglib-devel
tar
texinfo
transfig
unixODBC-devel
valgrind
xmlto
xorg-x11-font-utils
xulrunner-devel
xz-devel
librsvg2-tools
sword-devel
readline-devel
pilot-link-devel
lirc-devel
wireless-tools-devel
libudisks2-devel
cryptsetup-devel
xine-lib-devel
libassuan-devel
libksba-devel
db4-devel
swig

@ -1,214 +0,0 @@
advancecomp
alsa-lib-devel
aspell
aspell-devel
aspell-en
audiofile-devel
bind-devel
bison
boost-devel
bzip2-devel
ccache
cdparanoia
chmlib-devel
chrpath
cmake
cups-devel
curl-devel
db5-devel
dbus-devel
dbus-glib
dbus-glib-devel
djvulibre
docbook-dtd412-xml
docbook-style-xsl
docbook-utils
doxygen
drakconf
dssi-devel
expat-devel
fdupes
fftw-devel
firebird-devel
flex
fontconfig-devel
freetype2-devel
freetype-devel
fribidi-devel
gamin-devel
gettext-devel
glib2-devel
gnokii-devel
gperf
gpgme-devel
gphoto2-devel
GraphicsMagick-devel
gsl-devel
gtk2-devel
gtk+3.0-devel
gtk-doc
hspell-devel
ImageMagick-devel
imake
java-1.8.0-openjdk
java-1.8.0-openjdk-devel
karma-sharp
kde-dev-scripts
lcms-devel
lib64apr-devel
lib64apr-util-devel
lib64binutils-devel
lib64clucene-devel
lib64commoncpp-devel
lib64curl-devel
lib64dvdread-devel
lib64ecpg9.4_6
lib64exiv2-devel
lib64ffmpeg-devel
lib64flac-devel
lib64flac++-devel
lib64fontenc-devel
lib64inotifytools-devel
lib64jasper-devel
lib64jpeg-devel
lib64lame-devel
lib64lua-devel
lib64mad-devel
lib64paper-devel
lib64poppler-devel
lib64pulseaudio-devel
lib64sane1-devel
lib64t1lib-devel
lib64tiff-devel
lib64twolame-devel
lib64udev-devel
lib64usb1.0-devel
lib64utempter-devel
lib64v4l-devel
lib64xaw-devel
lib64xi-devel
lib64xine1.2-devel
lib64xscrnsaver-devel
lib64xtst-devel
lib64xxf86dga-devel
lib64yaz-devel
libart_lgpl-devel
libblkid-devel
libcdda-devel
libclucene-devel
libcommoncpp-devel
libconfig-devel
libcurl-devel
libdvdread-devel
libffmpeg-devel
libflac-devel
libflac++-devel
libgadu-devel
libgpod-devel
libgsf-devel
libgstreamer1.0-devel
libgstreamer-plugins-base1.0-devel
libhd-devel
libical-devel
libice-devel
libifp-devel
libinotifytools-devel
libiodbc-devel
libiw-devel
libjack-devel
libjasper-devel
libkarma-devel
liblo-devel
liblrdf-devel
libmad-devel
libmng-devel
libmp4v2-devel
libmpcdec-devel
libmtp-devel
libmusicbrainz-devel
libnjb-devel
libofx-devel
libotr-devel
libpaper-devel
libraw1394-devel
librsvg
libsmbclient-devel
libsm-devel
libsndfile-devel
libt1lib-devel
libtheora-devel
libungif-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
libx11-devel
libxcursor-devel
libxext-devel
libxft-devel
libxi-devel
libxinerama-devel
libxkbfile-devel
libxmu-devel
libxrandr-devel
libxrender-devel
libxslt-devel
libxv-devel
libxxf86dga-devel
libyaz-devel
lilo
lirc-devel
lm_sensors-devel
mesaglu-devel
mysql-devel
nas-devel
neon-devel
netpbm
net-snmp-devel
NetworkManager-glib-devel
ocaml
OpenEXR-devel
openldap-devel
openslp-devel
opensp-devel
optipng
pam-devel
pciutils-devel
perl-devel
perl(XML::Parser)
pilot-link-devel
pkgconfig(audiofile)
pkgconfig(libpng16)
postgresql9.4
postgresql9.4-devel
pth-devel
python-devel
python-sip
qt4-devel
readline-devel
recode
rpm-build
rpm-devel
ruby-devel
scons
SDL-devel
speex-devel
sqlite3-devel
sqlite-devel
subversion-devel
sword-devel
taglib-devel
transfig
udisks2-devel
udisks-devel
unixODBC-devel
valgrind
wv2-devel
x11-font-util
xmlto
xscreensaver
xscreensaver-base
xscreensaver-extrusion
xscreensaver-gl
yaz
zlib-devel
Loading…
Cancel
Save