summaryrefslogtreecommitdiffstats
path: root/redhat/libraries/libkdcraw
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/libraries/libkdcraw')
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec40
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec16
2 files changed, 11 insertions, 45 deletions
diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
index 8b792af4a..d3ad7ed60 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec
@@ -1,5 +1,5 @@
#
-# spec file for package libkdcraw (version R14.0.0)
+# spec file for package libkdcraw (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,12 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg libkdcraw
%define tde_prefix /opt/trinity
%define tde_datadir %{tde_prefix}/share
@@ -35,7 +37,7 @@
Name: trinity-%{tde_pkg}
Epoch: %{tde_epoch}
Version: 0.1.9
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
Summary: Raw picture decoding C++ library (runtime) [Trinity]
Group: System/Libraries
URL: http://www.trinitydesktop.org/
@@ -64,7 +66,7 @@ BuildRequires: pkgconfig
BuildRequires: gettext
# LCMS support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?rhel} >= 7
BuildRequires: liblcms-devel
%else
BuildRequires: lcms-devel
@@ -108,12 +110,6 @@ libkdcraw contains the library of libkdcraw.
%{tde_libdir}/libkdcraw.so.4
%{tde_libdir}/libkdcraw.so.4.0.3
-%post -n trinity-%{libkdcraw}4
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkdcraw}4
-/sbin/ldconfig || :
-
##########
%package -n trinity-libkdcraw-common
@@ -131,18 +127,6 @@ libkdcraw contains the library of libkdcraw.
%defattr(-,root,root,-)
%{tde_datadir}/icons/hicolor/*/apps/kdcraw.png
-%post -n trinity-libkdcraw-common
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
-%postun -n trinity-libkdcraw-common
-for f in hicolor ; do
- touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
-done
-
##########
%package -n trinity-%{libkdcraw}-devel
@@ -166,12 +150,6 @@ library documentation is available on kdcraw.h header file.
%{tde_tdeincludedir}/libkdcraw/
%{tde_libdir}/pkgconfig/libkdcraw.pc
-%post -n trinity-%{libkdcraw}-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-%{libkdcraw}-devel
-/sbin/ldconfig || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -184,7 +162,7 @@ library documentation is available on kdcraw.h header file.
%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"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -228,6 +206,4 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.1.9-1
-- Initial release for TDE R14.0.0
+%changelog
diff --git a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
index 56c706a00..93e82bd9b 100644
--- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec
@@ -2,11 +2,6 @@
%define tde_pkg libkdcraw
%define tde_version 3.5.13.2
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# TDE specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
@@ -28,7 +23,7 @@ Summary: Raw picture decoding C++ library (runtime) [Trinity]
Epoch: 1
Version: 0.1.9
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
License: GPLv2+
Group: Environment/Libraries
@@ -91,7 +86,7 @@ library documentation is available on kdcraw.h header file.
%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"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
@@ -167,9 +162,4 @@ done
%{tde_tdeincludedir}/libkdcraw/
%{tde_libdir}/pkgconfig/libkdcraw.pc
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:0.1.9-1
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+%changelog
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-01 03:17:23 +0000