From bced056d7bc5d505a8e8fdb63d79eb802416e7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 15 Aug 2016 11:06:35 +0200 Subject: [PATCH] RPM Packaging: more changelog removal --- .../filelight-l10n/filelight-l10n.spec | 8 +------- .../fusion-icon/fusion-icon-14.0.0.spec | 7 +------ redhat/applications/fusion-icon/fusion-icon.spec | 7 +------ .../kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec | 8 +------- redhat/applications/kerry/kerry-3.5.13.spec | 4 +--- redhat/applications/kvpnc/kvpnc-14.0.0.spec | 5 +---- .../dependencies/libcaldav/libcaldav-14.0.0.spec | 4 +--- .../libcaldav/libcaldav-3.5.13.2.spec | 14 +------------- .../libcarddav/libcarddav-14.0.0.spec | 4 +--- .../libcarddav/libcarddav-3.5.13.2.spec | 11 +---------- redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec | 4 +--- .../libraries/libkdcraw/libkdcraw-3.5.13.2.spec | 7 +------ redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec | 4 +--- .../libraries/libkexiv2/libkexiv2-3.5.13.2.spec | 7 +------ redhat/libraries/libkipi/libkipi-14.0.0.spec | 4 +--- redhat/libraries/libkipi/libkipi-3.5.13.2.spec | 7 +------ .../libksquirrel/libksquirrel-14.0.0.spec | 4 +--- .../libksquirrel/libksquirrel-3.5.13.2.spec | 7 +------ .../libraries/libtdeldap/libtdeldap-14.0.0.spec | 15 +++++++++++---- .../libraries/libtqt-perl/libtqt-perl-14.0.0.spec | 4 +--- 20 files changed, 30 insertions(+), 105 deletions(-) diff --git a/redhat/applications/filelight-l10n/filelight-l10n.spec b/redhat/applications/filelight-l10n/filelight-l10n.spec index 44ad68312..5feb96b8f 100644 --- a/redhat/applications/filelight-l10n/filelight-l10n.spec +++ b/redhat/applications/filelight-l10n/filelight-l10n.spec @@ -109,10 +109,4 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) -%Changelog -* Tue May 01 2012 Francois Andriot - 1.0-2 -- Rebuilt for Fedora 17 -- Removes useless post and postun - -* Fri Nov 25 2011 Francois Andriot - 1.0-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec index f1f6a6e53..b45175063 100644 --- a/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec +++ b/redhat/applications/fusion-icon/fusion-icon-14.0.0.spec @@ -98,9 +98,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg -%Changelog -* Sat Aug 04 2012 Francois Andriot - 0.0.0+git20071028-2 -- Fix python module installation - -* Sat Nov 19 2011 Francois Andriot - 0.0.0+git20071028-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/fusion-icon/fusion-icon.spec b/redhat/applications/fusion-icon/fusion-icon.spec index a15a7b8f1..99f8992ff 100644 --- a/redhat/applications/fusion-icon/fusion-icon.spec +++ b/redhat/applications/fusion-icon/fusion-icon.spec @@ -107,9 +107,4 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %{tde_datadir}/icons/hicolor/scalable/apps/fusion-icon.svg -%Changelog -* Sat Aug 04 2012 Francois Andriot - 0.0.0+git20071028-2 -- Fix python module installation - -* Sat Nov 19 2011 Francois Andriot - 0.0.0+git20071028-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec index 99fb357ce..fdaafa4b0 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec @@ -107,10 +107,4 @@ export PATH="%{tde_bindir}:${PATH}" %{_libdir}/mozilla/plugins/kaffeineplugin.so -%Changelog -* Thu Apr 26 2012 Francois Andriot - 0.4.3.1-2 -- Rebuild with nicer patch. - -* Sat Dec 03 2011 Francois Andriot - 0.4.3.1.dfsg-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - +%changelog diff --git a/redhat/applications/kerry/kerry-3.5.13.spec b/redhat/applications/kerry/kerry-3.5.13.spec index d530fac78..ead20877c 100644 --- a/redhat/applications/kerry/kerry-3.5.13.spec +++ b/redhat/applications/kerry/kerry-3.5.13.spec @@ -143,6 +143,4 @@ update-desktop-database %{tde_appdir} &> /dev/null %{tde_datadir}/icons/hicolor/*/*/* -%Changelog -* Fri Nov 25 2011 Francois Andriot - 0.2.1-1 -- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16 +%changelog diff --git a/redhat/applications/kvpnc/kvpnc-14.0.0.spec b/redhat/applications/kvpnc/kvpnc-14.0.0.spec index c18b2da5a..173ae9e32 100644 --- a/redhat/applications/kvpnc/kvpnc-14.0.0.spec +++ b/redhat/applications/kvpnc/kvpnc-14.0.0.spec @@ -176,7 +176,4 @@ update-desktop-database %{tde_tdeappdir} -q &> /dev/null ||: %{tde_datadir}/services/pcf.protocol -%Changelog -* Fri Jul 05 2013 Francois Andriot - 2:0.9.6a-1 -- Initial release for TDE 14.0.0 - +%changelog diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index fb01bb0cd..a4bf7ebb2 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -195,6 +195,4 @@ mv -f %{?buildroot}%{_docdir}/libcaldav/ %{?buildroot}%{_docdir}/libcaldav-%{ver %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot - 2:0.6.5-1 -- Initial release for TDE R14.0.0 +%changelog diff --git a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec index a06586276..419ff8ff9 100644 --- a/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec +++ b/redhat/dependencies/libcaldav/libcaldav-3.5.13.2.spec @@ -192,16 +192,4 @@ mv -f %{?buildroot}%{_includedir}/libcaldav-0.6.2/ %{?buildroot}%{_includedir}/l %__rm -rf %{buildroot} -%Changelog -* Fri Aug 16 2013 Francois Andriot - 0.6.5-4 -- Build for Fedora 19 - -* Sat Jul 28 2012 Francois Andriot - 0.6.5-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Thu Nov 03 2011 Francois Andriot - 0.6.5-2debian2.2 -- Add missing BuildRequires - -* Sun Oct 30 2011 Francois Andriot - 0.6.5-2debian2.1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 +%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec index 9ec474a4c..27e23795e 100644 --- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec +++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec @@ -194,6 +194,4 @@ fi %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot - 2:0.6.2-1 -- Initial release for TDE R14.0.0 +%changelog diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec index bd0c965ca..152f1cf90 100644 --- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec +++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec @@ -192,13 +192,4 @@ fi %__rm -rf %{buildroot} -%Changelog -* Fri Aug 16 2013 Francois Andriot - 0.6.2-4 -- Build for Fedora 19 - -* Sat Jul 28 2012 Francois Andriot - 0.6.2-3 -- Renames to 'trinity-libcaldav' -- Build on MGA2 - -* Sun Oct 30 2011 Francois Andriot - 0.6.2-2debian2 .1 -- Initial release for RHEL 6, RHEL 5, and Fedora 15 +%changelog diff --git a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec index d53712c39..87c5e77e8 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-14.0.0.spec @@ -230,6 +230,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot - 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 43d475322..93e82bd9b 100644 --- a/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec +++ b/redhat/libraries/libkdcraw/libkdcraw-3.5.13.2.spec @@ -162,9 +162,4 @@ done %{tde_tdeincludedir}/libkdcraw/ %{tde_libdir}/pkgconfig/libkdcraw.pc -%Changelog -* Fri Aug 16 2013 Francois Andriot - 1:0.1.9-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec index 0eee4a8c9..219f15c4f 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-14.0.0.spec @@ -199,6 +199,4 @@ export PATH="%{tde_bindir}:${PATH}" -%Changelog -* Fri Jul 05 2013 Francois Andriot - 0.1.7-2 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec index 71df464e3..38f08646a 100644 --- a/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec +++ b/redhat/libraries/libkexiv2/libkexiv2-3.5.13.2.spec @@ -152,9 +152,4 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_libdir}/pkgconfig/libkexiv2.pc -%Changelog -* Fri Aug 16 2013 Francois Andriot - 0.1.7-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libkipi/libkipi-14.0.0.spec b/redhat/libraries/libkipi/libkipi-14.0.0.spec index d98a1125d..04e3600d6 100644 --- a/redhat/libraries/libkipi/libkipi-14.0.0.spec +++ b/redhat/libraries/libkipi/libkipi-14.0.0.spec @@ -223,6 +223,4 @@ export PATH="%{tde_bindir}:${PATH}" -%Changelog -* Fri Jul 05 2013 Francois Andriot - 0.1.5-2 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec index 40c81866b..740aea3b1 100644 --- a/redhat/libraries/libkipi/libkipi-3.5.13.2.spec +++ b/redhat/libraries/libkipi/libkipi-3.5.13.2.spec @@ -164,9 +164,4 @@ done %{tde_tdeincludedir}/libkipi/ %{tde_libdir}/pkgconfig/libkipi.pc -%Changelog -* Fri Aug 16 2013 Francois Andriot - 0.1.5-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec index e46efef40..84f2f8cc7 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec @@ -573,6 +573,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot - 2:0.8.0-1 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec index dbf27128b..9945da33c 100644 --- a/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec +++ b/redhat/libraries/libksquirrel/libksquirrel-3.5.13.2.spec @@ -511,9 +511,4 @@ export PATH="%{tde_bindir}:${PATH}" %{tde_bindir}/ksquirrel-libs-xim2ppm -%Changelog -* Fri Aug 16 2013 Francois Andriot - 0.8.0-1 -- Build for Fedora 19 - -* Mon Jun 03 2013 Francois Andriot - 3.5.13.2-1 -- Initial release for TDE 3.5.13.2 +%changelog diff --git a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec index b23cff166..4c37c61ee 100644 --- a/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec +++ b/redhat/libraries/libtdeldap/libtdeldap-14.0.0.spec @@ -93,6 +93,11 @@ BuildRequires: openldap2-devel BuildRequires: openldap24-libs-devel %endif +# HEIMDAL support +%if %{?rhel} == 7 +BuildRequires: heimdal-devel +%endif + %description LDAP interface library for TDE management modules. @@ -170,9 +175,13 @@ export PATH="%{tde_bindir}:${PATH}" --disable-gcc-hidden-visibility \ \ %if 0%{?rhel} == 5 - --with-extra-includes=/usr/include/openldap24 \ + --with-extra-includes=%{_includedir}/openldap24 \ --with-extra-libs=%{_libdir}/openldap24 \ %endif +%if 0%{?rhel} == 7 + --with-extra-includes=%{_includedir}/heimdal \ + --with-extra-libs=%{_libdir}/heimdal \ +%endif %__make %{?_smp_mflags} @@ -187,6 +196,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot - 20.5-1 -- Initial release for TDE 14.0.0 +%changelog diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec index 67b702b8c..ab21298c0 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec @@ -172,6 +172,4 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%Changelog -* Fri Jul 05 2013 Francois Andriot - 3.008-1 -- Initial release for TDE 14.0.0 +%changelog