From 84236b1a97dac6fc43ba593b98577f7b820a1c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 5 Jul 2013 20:20:56 +0200 Subject: RPM Packaging: rename lots of SPEC files --- redhat/applications/kdiff3/kdiff3-3.5.12.spec | 111 ++++++++++++++ redhat/applications/kdiff3/kdiff3-3.5.13.1.spec | 159 +++++++++++++++++++ redhat/applications/kdiff3/kdiff3-3.5.13.2.spec | 168 +++++++++++++++++++++ redhat/applications/kdiff3/kdiff3-3.5.13.spec | 160 ++++++++++++++++++++ .../applications/kdiff3/trinity-kdiff3-3.5.12.spec | 111 -------------- .../kdiff3/trinity-kdiff3-3.5.13.1.spec | 159 ------------------- .../kdiff3/trinity-kdiff3-3.5.13.2.spec | 168 --------------------- .../applications/kdiff3/trinity-kdiff3-3.5.13.spec | 160 -------------------- 8 files changed, 598 insertions(+), 598 deletions(-) create mode 100644 redhat/applications/kdiff3/kdiff3-3.5.12.spec create mode 100644 redhat/applications/kdiff3/kdiff3-3.5.13.1.spec create mode 100644 redhat/applications/kdiff3/kdiff3-3.5.13.2.spec create mode 100644 redhat/applications/kdiff3/kdiff3-3.5.13.spec delete mode 100644 redhat/applications/kdiff3/trinity-kdiff3-3.5.12.spec delete mode 100644 redhat/applications/kdiff3/trinity-kdiff3-3.5.13.1.spec delete mode 100644 redhat/applications/kdiff3/trinity-kdiff3-3.5.13.2.spec delete mode 100644 redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec (limited to 'redhat/applications/kdiff3') diff --git a/redhat/applications/kdiff3/kdiff3-3.5.12.spec b/redhat/applications/kdiff3/kdiff3-3.5.12.spec new file mode 100644 index 000000000..6383af2d2 --- /dev/null +++ b/redhat/applications/kdiff3/kdiff3-3.5.12.spec @@ -0,0 +1,111 @@ +# Default version for this component +%define kdecomp kdiff3 +%define version 0.9.91 +%define release 2 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.12 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir} +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/kde3 + + +Name: trinity-%{kdecomp} +Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Source0: %{kdecomp}-3.5.12.tar.gz + + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils + +%description +Shows the differences line by line and character by character (!). +Provides an automatic merge-facility and +an integrated editor for comfortable solving of merge-conflicts. +Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.). +Unicode & UTF-8 support + + +%prep +%setup -q -n applications/%{kdecomp} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%make_install + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_bindir}/* +%{_datadir}/apps/*/ +%{_datadir}/icons/*/*/*/* +%{_datadir}/locale/*/*/*.mo +%{tde_docdir}/HTML/*/* +%{_datadir}/services/*.desktop +%{tde_libdir}/*.so +%{_datadir}/applnk/Development/*.desktop +%{_datadir}/applnk/.hidden/*.desktop +%{_mandir}/man*/* + +%{tde_libdir}/*.la + +%Changelog +* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec new file mode 100644 index 000000000..625cd5991 --- /dev/null +++ b/redhat/applications/kdiff3/kdiff3-3.5.13.1.spec @@ -0,0 +1,159 @@ +# Default version for this component +%define kdecomp kdiff3 + +# 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 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. +Version: 0.9.91 +Release: 5%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.1.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 +BuildRequires: trinity-arts-devel >= 3.5.13.1 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 +BuildRequires: trinity-tdebase-devel >= 3.5.13.1 +BuildRequires: desktop-file-utils + +%description +Shows the differences line by line and character by character (!). +Provides an automatic merge-facility and +an integrated editor for comfortable solving of merge-conflicts. +Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). +Unicode & UTF-8 support + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{kdecomp}-3.5.13.1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__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" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +for f in hicolor locolor; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : +done + +%postun +for f in hicolor locolor; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : +done + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_bindir}/* +%{tde_datadir}/apps/*/ +%{tde_datadir}/icons/hicolor/*/*/* +%{tde_datadir}/icons/locolor/*/*/* +%{tde_tdedocdir}/HTML/*/* +%{tde_datadir}/services/*.desktop +%{tde_datadir}/applnk/Development/*.desktop +%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop +%{tde_mandir}/man*/* + +%{tde_tdelibdir}/*.so +%{tde_tdelibdir}/*.la + +%changelog +* Wed Oct 03 2012 Francois Andriot - 0.9.91-5 +- Initial build for TDE 3.5.13.1 + +* Tue May 01 2012 Francois Andriot - 0.9.91-4 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Fix post and postun +- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] +- Remove additional unneeded tq method conversions [Commit #9b57232f] +- Rename obsolete tq methods to standard names [Commit #d654b107] + +* Sun Oct 30 2011 Francois Andriot - 0.9.91-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec new file mode 100644 index 000000000..b5d2ee93b --- /dev/null +++ b/redhat/applications/kdiff3/kdiff3-3.5.13.2.spec @@ -0,0 +1,168 @@ +# Default version for this component +%define tdecomp kdiff3 + +# 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 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{tdecomp} +Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. +Version: 0.9.91 +Release: 6%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{name}-3.5.13.2.tar.gz + +BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 +BuildRequires: trinity-arts-devel >= 3.5.13.2 +BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 +BuildRequires: trinity-tdebase-devel >= 3.5.13.2 +BuildRequires: desktop-file-utils + +%description +Shows the differences line by line and character by character (!). +Provides an automatic merge-facility and +an integrated editor for comfortable solving of merge-conflicts. +Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). +Unicode & UTF-8 support + + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + + +%prep +%setup -q -n %{name}-3.5.13.2 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__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" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt3.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --includedir=%{tde_tdeincludedir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# Unwanted files +%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/ + +%find_lang %{tdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +for f in hicolor locolor; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : +done + +%postun +for f in hicolor locolor; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : +done + + +%files -f %{tdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_bindir}/kdiff3 +%{tde_datadir}/apps/kdiff3/ +%{tde_datadir}/apps/kdiff3part/ +%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png +%{tde_datadir}/icons/locolor/*/apps/kdiff3.png +%{tde_tdedocdir}/HTML/*/kdiff3/ +%{tde_datadir}/services/kdiff3_plugin.desktop +%{tde_datadir}/services/kdiff3part.desktop +%{tde_datadir}/applnk/Development/*.desktop +%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop +%{tde_mandir}/man*/* +%{tde_tdelibdir}/libkdiff3part.la +%{tde_tdelibdir}/libkdiff3part.so +%{tde_tdelibdir}/libkdiff3plugin.la +%{tde_tdelibdir}/libkdiff3plugin.so + +%changelog +* Mon Jun 03 2013 Francois Andriot - 0.9.91-6 +- Initial release for TDE 3.5.13.2 + +* Wed Oct 03 2012 Francois Andriot - 0.9.91-5 +- Initial build for TDE 3.5.13.1 + +* Tue May 01 2012 Francois Andriot - 0.9.91-4 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Fix post and postun +- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] +- Remove additional unneeded tq method conversions [Commit #9b57232f] +- Rename obsolete tq methods to standard names [Commit #d654b107] + +* Sun Oct 30 2011 Francois Andriot - 0.9.91-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/kdiff3/kdiff3-3.5.13.spec b/redhat/applications/kdiff3/kdiff3-3.5.13.spec new file mode 100644 index 000000000..b560c7647 --- /dev/null +++ b/redhat/applications/kdiff3/kdiff3-3.5.13.spec @@ -0,0 +1,160 @@ +# Default version for this component +%define kdecomp kdiff3 + +# 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 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + + +Name: trinity-%{kdecomp} +Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. +Version: 0.9.91 +Release: 4%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org/ + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +# [kdiff3] Rename old tq methods that no longer need a unique name [Commit #c7e29c46] +Patch0: bp000-c7e29c46.diff +# [kdiff3] Remove additional unneeded tq method conversions [Commit #9b57232f] +Patch1: bp001-9b57232f.diff +# [kdiff3] Rename obsolete tq methods to standard names [Commit #d654b107] +Patch2: bp002-d654b107.diff + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel +BuildRequires: desktop-file-utils + +%description +Shows the differences line by line and character by character (!). +Provides an automatic merge-facility and +an integrated editor for comfortable solving of merge-conflicts. +Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). +Unicode & UTF-8 support + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i admin/acinclude.m4.in \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__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" +%__make -f "admin/Makefile.common" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" + +%configure \ + --prefix=%{tde_prefix} \ + --exec-prefix=%{tde_prefix} \ + --bindir=%{tde_bindir} \ + --datadir=%{tde_datadir} \ + --libdir=%{tde_libdir} \ + --mandir=%{tde_mandir} \ + --disable-rpath \ + --with-extra-includes=%{tde_includedir}/tqt \ + --enable-closure + +%__make %{?_smp_mflags} + + +%install +export PATH="%{tde_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +for f in hicolor locolor; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done + +%postun +for f in hicolor locolor; do + touch --no-create %{tde_datadir}/icons/${f} || : + gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : +done + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{tde_bindir}/* +%{tde_datadir}/apps/*/ +%{tde_datadir}/icons/hicolor/*/*/* +%{tde_datadir}/icons/locolor/*/*/* +%{tde_tdedocdir}/HTML/*/* +%{tde_datadir}/services/*.desktop +%{tde_datadir}/applnk/Development/*.desktop +%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop +%{tde_mandir}/man*/* + +%{tde_tdelibdir}/*.so +%{tde_tdelibdir}/*.la + +%Changelog +* Tue May 01 2012 Francois Andriot - 0.9.91-4 +- Rebuilt for Fedora 17 +- Fix HTML directory location +- Fix post and postun +- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] +- Remove additional unneeded tq method conversions [Commit #9b57232f] +- Rename obsolete tq methods to standard names [Commit #d654b107] + +* Sun Oct 30 2011 Francois Andriot - 0.9.91-3 +- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 + +* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 +- Import to GIT + +* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 +- Correct macro to install under "/opt", if desired + +* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 +- Initial build for RHEL 6.0 + diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.12.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.12.spec deleted file mode 100644 index 6383af2d2..000000000 --- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.12.spec +++ /dev/null @@ -1,111 +0,0 @@ -# Default version for this component -%define kdecomp kdiff3 -%define version 0.9.91 -%define release 2 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _variant .opt -%define _docdir %{_prefix}/share/doc -%endif - -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/kde3 - - -Name: trinity-%{kdecomp} -Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Source0: %{kdecomp}-3.5.12.tar.gz - - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel -BuildRequires: desktop-file-utils - -%description -Shows the differences line by line and character by character (!). -Provides an automatic merge-facility and -an integrated editor for comfortable solving of merge-conflicts. -Supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.). -Unicode & UTF-8 support - - -%prep -%setup -q -n applications/%{kdecomp} - -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} -%make_install - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{_bindir}/* -%{_datadir}/apps/*/ -%{_datadir}/icons/*/*/*/* -%{_datadir}/locale/*/*/*.mo -%{tde_docdir}/HTML/*/* -%{_datadir}/services/*.desktop -%{tde_libdir}/*.so -%{_datadir}/applnk/Development/*.desktop -%{_datadir}/applnk/.hidden/*.desktop -%{_mandir}/man*/* - -%{tde_libdir}/*.la - -%Changelog -* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 -- Initial build for RHEL 6.0 - diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.1.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.1.spec deleted file mode 100644 index 625cd5991..000000000 --- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.1.spec +++ /dev/null @@ -1,159 +0,0 @@ -# Default version for this component -%define kdecomp kdiff3 - -# 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 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. -Version: 0.9.91 -Release: 5%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-arts-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -%description -Shows the differences line by line and character by character (!). -Provides an automatic merge-facility and -an integrated editor for comfortable solving of merge-conflicts. -Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). -Unicode & UTF-8 support - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{kdecomp}-3.5.13.1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__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" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/* -%{tde_datadir}/apps/*/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_tdedocdir}/HTML/*/* -%{tde_datadir}/services/*.desktop -%{tde_datadir}/applnk/Development/*.desktop -%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop -%{tde_mandir}/man*/* - -%{tde_tdelibdir}/*.so -%{tde_tdelibdir}/*.la - -%changelog -* Wed Oct 03 2012 Francois Andriot - 0.9.91-5 -- Initial build for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 0.9.91-4 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Fix post and postun -- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] -- Remove additional unneeded tq method conversions [Commit #9b57232f] -- Rename obsolete tq methods to standard names [Commit #d654b107] - -* Sun Oct 30 2011 Francois Andriot - 0.9.91-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 -- Initial build for RHEL 6.0 - diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.2.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.2.spec deleted file mode 100644 index b5d2ee93b..000000000 --- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.2.spec +++ /dev/null @@ -1,168 +0,0 @@ -# Default version for this component -%define tdecomp kdiff3 - -# 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 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tdecomp} -Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. -Version: 0.9.91 -Release: 6%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-3.5.13.2.tar.gz - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 -BuildRequires: trinity-arts-devel >= 3.5.13.2 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 -BuildRequires: trinity-tdebase-devel >= 3.5.13.2 -BuildRequires: desktop-file-utils - -%description -Shows the differences line by line and character by character (!). -Provides an automatic merge-facility and -an integrated editor for comfortable solving of merge-conflicts. -Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). -Unicode & UTF-8 support - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -%setup -q -n %{name}-3.5.13.2 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__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" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Unwanted files -%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/kdiff3/ - -%find_lang %{tdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} &>/dev/null || : -done - - -%files -f %{tdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/kdiff3 -%{tde_datadir}/apps/kdiff3/ -%{tde_datadir}/apps/kdiff3part/ -%{tde_datadir}/icons/hicolor/*/apps/kdiff3.png -%{tde_datadir}/icons/locolor/*/apps/kdiff3.png -%{tde_tdedocdir}/HTML/*/kdiff3/ -%{tde_datadir}/services/kdiff3_plugin.desktop -%{tde_datadir}/services/kdiff3part.desktop -%{tde_datadir}/applnk/Development/*.desktop -%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop -%{tde_mandir}/man*/* -%{tde_tdelibdir}/libkdiff3part.la -%{tde_tdelibdir}/libkdiff3part.so -%{tde_tdelibdir}/libkdiff3plugin.la -%{tde_tdelibdir}/libkdiff3plugin.so - -%changelog -* Mon Jun 03 2013 Francois Andriot - 0.9.91-6 -- Initial release for TDE 3.5.13.2 - -* Wed Oct 03 2012 Francois Andriot - 0.9.91-5 -- Initial build for TDE 3.5.13.1 - -* Tue May 01 2012 Francois Andriot - 0.9.91-4 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Fix post and postun -- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] -- Remove additional unneeded tq method conversions [Commit #9b57232f] -- Rename obsolete tq methods to standard names [Commit #d654b107] - -* Sun Oct 30 2011 Francois Andriot - 0.9.91-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 -- Initial build for RHEL 6.0 - diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec deleted file mode 100644 index b560c7647..000000000 --- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec +++ /dev/null @@ -1,160 +0,0 @@ -# Default version for this component -%define kdecomp kdiff3 - -# 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 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: KDiff3 is a utility for comparing and/or merging two or three text files or directories. -Version: 0.9.91 -Release: 4%{?dist}%{?_variant} - -License: GPLv2+ -Group: Applications/Utilities - -Vendor: Trinity Project -Packager: Francois Andriot -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.tar.gz - -# [kdiff3] Rename old tq methods that no longer need a unique name [Commit #c7e29c46] -Patch0: bp000-c7e29c46.diff -# [kdiff3] Remove additional unneeded tq method conversions [Commit #9b57232f] -Patch1: bp001-9b57232f.diff -# [kdiff3] Rename obsolete tq methods to standard names [Commit #d654b107] -Patch2: bp002-d654b107.diff - -BuildRequires: tqtinterface-devel -BuildRequires: trinity-arts-devel -BuildRequires: trinity-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils - -%description -Shows the differences line by line and character by character (!). -Provides an automatic merge-facility and -an integrated editor for comfortable solving of merge-conflicts. -Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.). -Unicode & UTF-8 support - - -%prep -%setup -q -n applications/%{kdecomp} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -# Ugly hack to modify TQT include directory inside autoconf files. -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -%__sed -i admin/acinclude.m4.in \ - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" - -%__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" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --datadir=%{tde_datadir} \ - --libdir=%{tde_libdir} \ - --mandir=%{tde_mandir} \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%find_lang %{kdecomp} - -%clean -%__rm -rf %{buildroot} - - -%post -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - -%postun -for f in hicolor locolor; do - touch --no-create %{tde_datadir}/icons/${f} || : - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || : -done - - -%files -f %{kdecomp}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING -%{tde_bindir}/* -%{tde_datadir}/apps/*/ -%{tde_datadir}/icons/hicolor/*/*/* -%{tde_datadir}/icons/locolor/*/*/* -%{tde_tdedocdir}/HTML/*/* -%{tde_datadir}/services/*.desktop -%{tde_datadir}/applnk/Development/*.desktop -%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop -%{tde_mandir}/man*/* - -%{tde_tdelibdir}/*.so -%{tde_tdelibdir}/*.la - -%Changelog -* Tue May 01 2012 Francois Andriot - 0.9.91-4 -- Rebuilt for Fedora 17 -- Fix HTML directory location -- Fix post and postun -- Rename old tq methods that no longer need a unique name [Commit #c7e29c46] -- Remove additional unneeded tq method conversions [Commit #9b57232f] -- Rename obsolete tq methods to standard names [Commit #d654b107] - -* Sun Oct 30 2011 Francois Andriot - 0.9.91-3 -- Rebuilt for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15 - -* Tue Sep 14 2011 Francois Andriot - 0.9.91-2 -- Import to GIT - -* Wed Aug 24 2011 Francois Andriot - 0.9.91-1 -- Correct macro to install under "/opt", if desired - -* Sun Aug 14 2011 Francois Andriot - 0.9.91-0 -- Initial build for RHEL 6.0 - -- cgit v1.2.1