rpms/qt
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

4.8.5-0.6.rc2

Browse Source 
- trim changelog
- cleaner rpm_macros_dir handling
This commit is contained in:
Rex Dieter 2013-06-26 09:33:11 -05:00
parent 088b772329
commit b442626fe7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qt.spec
View File

@ -13,11 +13,15 @@
%define qt_settings 1 %define qt_settings 1
%endif %endif
%define rpm_macros_dir %{_sysconfdir}/rpm %if 0%{?_rpmconfigdir:1}
%if 0%{?fedora} > 18
%define rpm_macros_dir %{_rpmconfigdir}/macros.d %define rpm_macros_dir %{_rpmconfigdir}/macros.d
%else
%define rpm_macros_dir %{_sysconfdir}/rpm
%endif %endif
# trim changelog included in binary rpms
%global _changelog_trimtime %(date +%s -d "1 year ago")
# use qtchooser (default off, for now) # use qtchooser (default off, for now)
#define qtchooser 1 #define qtchooser 1
@ -27,7 +31,7 @@ Summary: Qt toolkit
Name: qt Name: qt
Epoch: 1 Epoch: 1
Version: 4.8.5 Version: 4.8.5
Release: 0.5.%{pre}%{?dist} Release: 0.6.%{pre}%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
@ -1173,6 +1177,10 @@ fi
%changelog %changelog
* Wed Jun 26 2013 Rex Dieter <rdieter@fedoraproject.org> 4.8.5-0.6.rc2
- trim changelog
- cleaner rpm_macros_dir handling
* Fri Jun 21 2013 Rex Dieter <rdieter@fedoraproject.org> 4.8.5-0.5.rc2 * Fri Jun 21 2013 Rex Dieter <rdieter@fedoraproject.org> 4.8.5-0.5.rc2
- drop multilib portion from qt_plugin_path.patch - drop multilib portion from qt_plugin_path.patch