RPM Packaging: update 3.5.13.2 for Fedora 20

pull/3/head
François Andriot 11 years ago
parent 4a3e6e0caf
commit 37e11c19d7

@ -27,7 +27,7 @@
Name: qt3 Name: qt3
Version: 3.3.8.d Version: 3.3.8.d
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv3+ and QPL License: GPLv3+ and QPL
Summary: Qt3 Sources Summary: Qt3 Sources
Group: System/Libraries Group: System/Libraries
@ -73,7 +73,7 @@ Buildroot: %_tmppath/%name-%version-%release-root
%if %buildSQL %if %buildSQL
BuildRequires: mysql-devel BuildRequires: mysql-devel
BuildRequires: unixODBC-devel BuildRequires: unixODBC-devel
BuildRequires: libpq-devel BuildRequires: postgresql-devel
%endif %endif
BuildRequires: freetype2-devel BuildRequires: freetype2-devel
BuildRequires: mesaglu-devel BuildRequires: mesaglu-devel
@ -99,7 +99,6 @@ BuildRequires: pkgconfig(libpng15)
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: nas-devel BuildRequires: nas-devel
BuildRequires: libiodbc-devel BuildRequires: libiodbc-devel
BuildRequires: postgresql-devel
BuildRequires: cups-devel BuildRequires: cups-devel
%if "%{_lib}" != "lib" %if "%{_lib}" != "lib"
@ -787,11 +786,20 @@ install -m 0755 %SOURCE9 %buildroot/%_sysconfdir/X11/xinit.d/
# Fix all buildroot paths # Fix all buildroot paths
#
# Fix path in qmake.conf
#
%__sed -i ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/*/qmake.conf \
-e "s|QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = %{_libdir}|"
%clean %clean
rm -fr %buildroot rm -fr %buildroot
%changelog %changelog
* Mon Sep 09 2013 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-5
- Fix path in qmake.conf
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-4 * Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> 3.3.8.d-4
- Initial release for TDE 3.5.13.2 - Initial release for TDE 3.5.13.2

@ -59,7 +59,7 @@ Patch135: parseFontName.diff
Patch136: qt3-no-date.diff Patch136: qt3-no-date.diff
Patch139: gcc46.diff Patch139: gcc46.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#Remember also to modify Requires in -devel package #Remember also to modify Requires in -devel package
BuildRequires: c++_compiler BuildRequires: c++_compiler
@ -82,10 +82,10 @@ BuildRequires: glu-devel
%if %suse_version >= 1310 %if %suse_version >= 1310
BuildRequires: libpng16-compat-devel BuildRequires: libpng16-compat-devel
%endif %endif
%if %suse_version >= 1210 && %suse_version < 1300 %if %suse_version == 1230
BuildRequires: libpng15-compat-devel BuildRequires: libpng15-compat-devel
%endif %endif
%if %suse_version >= 1110 && %suse_version < 1200 %if %suse_version >= 1110 && %suse_version <= 1220
BuildRequires: libpng14-compat-devel BuildRequires: libpng14-compat-devel
%endif %endif
@ -338,7 +338,7 @@ fi
%lang(zh) /usr/lib/qt3/translations/qt_zh-tw.qm %lang(zh) /usr/lib/qt3/translations/qt_zh-tw.qm
%config(noreplace) /etc/X11/qtrc %config(noreplace) /etc/X11/qtrc
%ifarch s390x sparc64 x86_64 ppc64 mips64 %ifarch s390x sparc64 x86_64 ppc64 mips64
%dir %{_libdir}/qt3 %{_libdir}/qt3
%endif %endif
%files devel %files devel

@ -124,7 +124,8 @@ This package provides the data files necessary for running Rosegarden
%build %build
unset QTDIR && . %{_sysconfdir}/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. %{_sysconfdir}/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"

@ -270,7 +270,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3 export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
export KDEDIR=%{tde_prefix} export KDEDIR=%{tde_prefix}
@ -291,7 +292,8 @@ fi
%install %install
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}" export EXTRA_MODULE_DIR="%{python_sitearch}/%{name}"
@ -389,7 +391,7 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
# generate guidance-power-manager script # generate guidance-power-manager script
cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager cat <<EOF >%{buildroot}%{tde_bindir}/guidance-power-manager
#!/bin/sh #!/bin/sh
export PYTHONPATH=%{python_sitearch}/%{name} export PYTHONPATH=%{python_sitearch}/%{name}:%{python_sitearch}/python-qt3
%{python_sitearch}/%{name}/guidance-power-manager.py & %{python_sitearch}/%{name}/guidance-power-manager.py &
EOF EOF
chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager chmod +x %{buildroot}%{tde_bindir}/guidance-power-manager

@ -73,7 +73,8 @@ gtk2-engines-qtcurve.
%build %build
unset QTDIR || : ; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export KDEDIR="%{tde_prefix}" export KDEDIR="%{tde_prefix}"

@ -71,7 +71,8 @@ as a directory.
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"

@ -70,7 +70,8 @@ remembered so next time the user won't have to enter them again.
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"

@ -25,6 +25,11 @@ elif [ -x /usr/bin/yum ]; then
PKGINST='sudo yum install -y' PKGINST='sudo yum install -y'
PKGDEL='sudo yum remove -y' PKGDEL='sudo yum remove -y'
REPOUPDATE='(cd $(rpm -E %{_rpmdir}); createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")' REPOUPDATE='(cd $(rpm -E %{_rpmdir}); createrepo $(uname -i); createrepo noarch; sudo yum clean all --disablerepo="*" --enablerepo="rpmbuild*")'
elif [ -x /usr/bin/apt-get ]; then
PKGMGR="apt-get"
PKGINST='sudo apt-get install -y'
PKGDEL='sudo apt-get remove -y'
REPOUPDATE='(cd $(rpm -E %{_rpmdir}); genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)'
fi fi
BUILDDIR=$(rpm -E "%{_builddir}") BUILDDIR=$(rpm -E "%{_builddir}")

@ -32,7 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Source1: kcmartsrc-pulseaudio Source1: kcmartsrc-pulseaudio
Patch0: arts-3.5.13.2-pkgconfig_requires.patch Patch1: arts-3.5.13.2-pkgconfig_requires.patch
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -196,6 +196,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .mad
%build %build

@ -136,12 +136,8 @@ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/python-qt3
# Shitty hack to add LDFLAGS # Shitty hack to add LDFLAGS
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%__sed -i */Makefile \ %__sed -i */Makefile \
%if 0%{?pclinuxos}
-e "/^LIBS = / s|$| -lpython2.6 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
%else
-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|" -e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
%endif %endif
%endif
%__make %{_smp_mflags} %__make %{_smp_mflags}

@ -18,6 +18,7 @@ cmake
commoncpp2-devel commoncpp2-devel
cppunit-devel cppunit-devel
createrepo createrepo
db4-devel
djvulibre djvulibre
djvulibre-devel djvulibre-devel
esound-devel esound-devel
@ -64,6 +65,7 @@ libdvdread-devel
libfontenc-devel libfontenc-devel
libgadu-devel libgadu-devel
libgpod-devel libgpod-devel
libgsf-devel
libgssapi-devel libgssapi-devel
libical-devel libical-devel
libidn-devel libidn-devel

@ -713,7 +713,8 @@ popd
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export KDEDIR=%{tde_prefix} export KDEDIR=%{tde_prefix}

@ -56,8 +56,10 @@ BuildRequires: libXtst-devel
BuildRequires: libxcb-devel BuildRequires: libxcb-devel
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} == 0
BuildRequires: %{_lib}xcb-devel BuildRequires: %{_lib}xcb-devel
%endif %endif
%endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xi-devel BuildRequires: %{_lib}xi-devel

@ -59,8 +59,12 @@ BuildRequires: openssl-devel
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
%define with_db 1 %define with_db 1
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos}
BuildRequires: db4-devel
%else
BuildRequires: db5-devel BuildRequires: db5-devel
%endif %endif
%endif
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18
BuildRequires: libdb-devel BuildRequires: libdb-devel
BuildRequires: libdb-cxx-devel BuildRequires: libdb-cxx-devel

@ -636,7 +636,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop %{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif %endif
%if 0%{?fedora} >= 15 %if 0%{?fedora} >= 15 || 0%{?pclinuxos}
%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop %{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop %{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop %{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
@ -644,13 +644,17 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop %{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif %endif
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18 || 0%{?pclinuxos}
%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop %{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop %{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop %{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop %{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
%endif %endif
%if 0%{?fedora} >= 20
%{tde_datadir}/applnk/System/ScreenSavers/geodesic.desktop
%endif
%endif %endif
########## ##########

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -0,0 +1,16 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session optional pam_console.so
-session optional pam_ck_connector.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth
session include postlogin

@ -0,0 +1,19 @@
#%PAM-1.0
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
auth required pam_env.so
auth substack system-auth
-auth optional pam_gnome_keyring.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session optional pam_console.so
-session optional pam_ck_connector.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth
-session optional pam_gnome_keyring.so auto_start
session include postlogin

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

Binary file not shown.

@ -0,0 +1,11 @@
module tdm.fc20 1.0;
require {
type fprintd_t;
type init_t;
class dbus send_msg;
}
#============= fprintd_t ==============
allow fprintd_t init_t:dbus send_msg;

@ -0,0 +1,12 @@
[Unit]
Description=The Trinity login manager
Conflicts=getty@tty1.service
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
[Service]
ExecStart=/opt/trinity/bin/kdm
Restart=always
IgnoreSIGPIPE=no
[Install]
Alias=display-manager.service

@ -130,13 +130,15 @@ BuildRequires: libXt-devel
# XINE support # XINE support
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1 %define with_xine 1
%if 0%{?pclinuxos} == 0
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xine1.2-devel BuildRequires: %{_lib}xine1.2-devel
%endif %endif
%endif
%if 0%{?fedora} || 0%{?rhel} %if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel BuildRequires: xine-lib-devel
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version} || 0%{?pclinuxos}
BuildRequires: libxine-devel BuildRequires: libxine-devel
%endif %endif
%endif %endif

Loading…
Cancel
Save