diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-11-27 21:34:48 +0100 |
| commit | a615d19df88eb2e989316b480519161945dbc7dc (patch) | |
| tree | 369970b98042998b86c11024598155e037b76fec /redhat/applications/digikam/digikam-3.5.13.2.spec | |
| parent | 76a93e0011ade1583a1ec672f33411dfd35454f3 (diff) | |
| download | tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.tar.gz tde-packaging-a615d19df88eb2e989316b480519161945dbc7dc.zip | |
RPM: merge redhat directory with master branch
Diffstat (limited to 'redhat/applications/digikam/digikam-3.5.13.2.spec')
| -rw-r--r-- | redhat/applications/digikam/digikam-3.5.13.2.spec | 46 |
1 files changed, 2 insertions, 44 deletions
diff --git a/redhat/applications/digikam/digikam-3.5.13.2.spec b/redhat/applications/digikam/digikam-3.5.13.2.spec index ff084696c..46bb635af 100644 --- a/redhat/applications/digikam/digikam-3.5.13.2.spec +++ b/redhat/applications/digikam/digikam-3.5.13.2.spec @@ -2,11 +2,6 @@ %define tde_pkg digikam %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 @@ -26,7 +21,7 @@ Name: trinity-%{tde_pkg} Summary: digital photo management application for TDE [Trinity] Version: 0.9.6 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist} License: GPLv2+ Group: Applications/Utilities @@ -127,7 +122,7 @@ Requires: %{name} = %{version}-%{release} %endif %__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" @@ -314,40 +309,3 @@ update-desktop-database %{tde_appdir} 2> /dev/null || : %changelog -* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-7 -- Build for Fedora 19 - -* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-6 -- Rebuild with NDEBUG option - -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.9.6-5 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-4 -- Initial release for TDE 3.5.13.1 - -* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3 -- Add support for Mageia 2 and Mandriva 2011 -- Removes old patches, adds GIT patches. -- Fix digikam FTBFS due to jpeg code [Commit #b9419cd5] -- Fix FTBFS due to png code [Bug #595] [Commit #3e27b07f] -- Remove version.h. Cruft from an older version prior to 0.9.6. -- Fix usage of obsolete libpng jmpbuf member [Commit #7d0d82b7] -- GCC 4.7 fix. [Bug #958] [Commit #a9489034] -- GCC 4.7 fix. [Bug #958] [Commit #a209c81b] -- Fix 'format not a string literal' error [Commit #029218cd] -- Update patch in GIT hash a9489034 to use reinterpret_cast. [Commit #5a043853] -- Fix FTBFS on png >= 0.15 [Commit #18ecd512] - -* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-3 -- Fix man directory location -- Fix postinstall -- Fix description -- Add "BuildRequires: exiv2-devel" - -* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.9.6-2 -- gcc 4.7 + libpng 1.5 patch for digikam (consolidated) [Bug #958] - -* Sun Nov 06 2011 Francois Andriot <francois.andriot@free.fr> - 0.9.6-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - |