RPM Packaging: update tdegraphics

pull/3/head
François Andriot 10 years ago
parent 63379c3da1
commit ee0882ed2b

@ -60,10 +60,11 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gettext BuildRequires: gettext
BuildRequires: libtool BuildRequires: libtool
BuildRequires: fdupes
# SUSE desktop files utility # SUSE desktop files utility
%if 0%{?suse_version} %if 0%{?suse_version}
@ -137,10 +138,6 @@ BuildRequires: t1lib-devel
%endif %endif
%endif %endif
# IMLIB1 support (kuickshow)
#BuildRequires: %{_lib}imlib-devel
#BuildRequires: imlib-devel
# SANE support # SANE support
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}sane1-devel BuildRequires: %{_lib}sane1-devel
@ -471,7 +468,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kfax %package -n trinity-kfax
Summary: G3/G4 fax viewer for Trinity Summary: G3/G4 fax viewer for Trinity
Group: Productivity/Graphics/Viewers Group: Productivity/Graphics/Viewers
Requires: libtiff
%description -n trinity-kfax %description -n trinity-kfax
A fax viewer for Trinity, supporting the display of raw and tiffed fax images A fax viewer for Trinity, supporting the display of raw and tiffed fax images
@ -1135,6 +1131,7 @@ done
%package -n trinity-libkscan-devel %package -n trinity-libkscan-devel
Summary: Development files for the Trinity scanner library Summary: Development files for the Trinity scanner library
Group: Development/Libraries/Other Group: Development/Libraries/Other
Requires: trinity-libkscan = %{version}-%{release}
%description -n trinity-libkscan-devel %description -n trinity-libkscan-devel
This package contains development files for Trinity's scanner library. This package contains development files for Trinity's scanner library.
@ -1218,7 +1215,8 @@ Requires: trinity-libkscan-devel = %{version}-%{release}
Requires: trinity-libpoppler-tqt-devel = %{version}-%{release} Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
%description devel %description devel
%{summary}. This package contains the development files needed to compile
applications against tdegraphics libraries.
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -1256,19 +1254,6 @@ Requires: trinity-libpoppler-tqt-devel = %{version}-%{release}
%postun devel %postun devel
/sbin/ldconfig || : /sbin/ldconfig || :
############
# Excludes kuickshow (built separately)
#%exclude %{tde_bindir}/kuickshow
#%exclude %{tde_tdelibdir}/kuickshow.la
#%exclude %{tde_tdelibdir}/kuickshow.so
#%exclude %{tde_libdir}/libtdeinit_kuickshow.la
#%exclude %{tde_libdir}/libtdeinit_kuickshow.so
#%exclude %{tde_tdeappdir}/kuickshow.desktop
#%exclude %{tde_datadir}/apps/kuickshow/
#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
#%exclude %{tde_tdedocdir}/HTML/en/kuickshow/
########## ##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 %if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@ -1303,7 +1288,7 @@ if ! rpm -E %%cmake|grep -q "cd build"; then
cd build cd build
fi fi
# Warning: GCC visibility causes FTBFS [Bug #1285] # Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \ %cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
@ -1365,6 +1350,9 @@ done
%suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kamera.desktop %suse_update_desktop_file %{?buildroot}%{tde_tdeappdir}/kamera.desktop
%endif %endif
# Symlinks duplicate files (mostly under 'ksgmltools2')
%fdupes -s "%{?buildroot}"
%clean %clean
%__rm -rf %{buildroot} %__rm -rf %{buildroot}

Loading…
Cancel
Save