From 1747b898a2426bb579ae897a41041127d3043cbf Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 24 Feb 2021 18:01:51 +0100 Subject: [PATCH] Removed obsolete templates for kde3 and kde4 --- README.md | 2 +- conf/06-security-system-library-paths.conf | 2 +- man/it/autospec.1.in | 4 - plugins/spec-create.in | 4 +- po/it/autospec.po | 6 - templates/Makefile | 2 +- templates/kde3 | 45 ------- templates/kde4 | 140 --------------------- 8 files changed, 4 insertions(+), 201 deletions(-) delete mode 100644 templates/kde3 delete mode 100644 templates/kde4 diff --git a/README.md b/README.md index 9fc3d37..fff59ab 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Autospec was created for the `QiLinux` distribution and is now used by the [open #### Templates (/usr/share/autospec/templates) * ghc * gnome - * kde3, kde4, kde5 + * kde5 * library * ocaml-libs * perl diff --git a/conf/06-security-system-library-paths.conf b/conf/06-security-system-library-paths.conf index c87534d..80ee9e2 100644 --- a/conf/06-security-system-library-paths.conf +++ b/conf/06-security-system-library-paths.conf @@ -1,4 +1,4 @@ ## Allowed paths for system libraries ----------------------------------------- allowed_libdirs="\ -/lib:/usr/lib:/usr/lib/qt3/lib:/usr/lib/qt4/lib:/opt/kde3/lib:/opt/kde/lib" +/lib:/usr/lib:/lib64:/usr/lib64" diff --git a/man/it/autospec.1.in b/man/it/autospec.1.in index 947d6dd..c090cef 100644 --- a/man/it/autospec.1.in +++ b/man/it/autospec.1.in @@ -200,10 +200,6 @@ categoria dello specfile da generare: .br \fIgnome\fR : specfile per pacchetti gnome .br -\fIkde3\fR : specfile per pacchetti kde3 -.br -\fIkde4\fR : specfile per pacchetti kde4 -.br \fIkde5\fR : specfile per pacchetti kde5 .br \fIlibrary\fR : specfile per librerie diff --git a/plugins/spec-create.in b/plugins/spec-create.in index 7b17a88..51c023f 100644 --- a/plugins/spec-create.in +++ b/plugins/spec-create.in @@ -113,8 +113,6 @@ function usage() { standard : "$"standard specfile (default)"" ghc : "$"specfile for ghc packages"" gnome : "$"specfile for gnome packages"" - kde3 : "$"specfile for kde3 packages"" - kde4 : "$"specfile for kde4 packages"" kde5 : "$"specfile for kde5 packages"" library : "$"specfile for common library packages"" ocaml-libs : "$"specfile for OCaml library packages"" @@ -878,7 +876,7 @@ ${standard_docs_devel:+$standard_docs_devel }$currdoc" local build_techology="unknown" case "$spec_type" in - kde3|kde4|perl|python) + perl|python) build_techology="$spec_type" ;; *) if [ -e $tmpdir/$pck_rootdir/meson.build ]; then diff --git a/po/it/autospec.po b/po/it/autospec.po index 6474ee3..abb71db 100644 --- a/po/it/autospec.po +++ b/po/it/autospec.po @@ -832,12 +832,6 @@ msgstr "specfile per pacchetti ghc" msgid "specfile for gnome packages" msgstr "specfile per pacchetti gnome" -msgid "specfile for kde3 packages" -msgstr "specfile per pacchetti kde3" - -msgid "specfile for kde4 packages" -msgstr "specfile per pacchetti kde4" - msgid "specfile for kde5 packages" msgstr "specfile per pacchetti kde5" diff --git a/templates/Makefile b/templates/Makefile index a8b61a2..50ad251 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -18,7 +18,7 @@ srcdir = .. include $(srcdir)/Makefile.env -pck_templates := ghc gnome kde3 kde4 kde5 library ocaml-libs perl python standard standard-daemon web +pck_templates := ghc gnome kde5 library ocaml-libs perl python standard standard-daemon web all: diff --git a/templates/kde3 b/templates/kde3 deleted file mode 100644 index dc05527..0000000 --- a/templates/kde3 +++ /dev/null @@ -1,45 +0,0 @@ -Name: @pck_name@ -Version: @pck_version@ -Release: @spec_first_release@@DISTRO_rpm@ -Summary: ... -Group: ... -Vendor: @VENDOR@ -Distribution: @DISTRO@ -Packager: $packager_fullname <$packager_email> -URL: ... -Source: ... -License: ... -## AUTOBUILDREQ-BEGIN -## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements. -## AUTOBUILDREQ-END - -%description -... - -@if:debug_package -%debug_package -@fi:debug_package - -%prep -%setup -q - -%build -%configure_kde -%make - -%install -[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall - -%clean -[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" - -%files -%defattr(-,root,root) -@standard_docs@ -## note: eventually add the remaining documents (if any) -# @standard_docs_devel@ - -%changelog -* @spec_changelog_date@ @packager_fullname@ <@packager_email@> @pck_version@-@spec_first_release@@DISTRO_rpm@ -- @spec_changelog_comment@ diff --git a/templates/kde4 b/templates/kde4 deleted file mode 100644 index 53d5ecc..0000000 --- a/templates/kde4 +++ /dev/null @@ -1,140 +0,0 @@ -Name: @pck_name@ -Version: @pck_version@ -Release: @spec_first_release@@DISTRO_rpm@ -Summary: ... -Group: ... -Vendor: @VENDOR@ -Distribution: @DISTRO@ -Packager: @packager_fullname@ <@packager_email@> -URL: http://www.kde.org -Source: ... -License: ... -BuildRequires: automoc4 -BuildRequires: cmake -BuildRequires: libqt4-devel -BuildRequires: kdelibs-devel -## AUTOBUILDREQ-BEGIN -## note: run 'autospec -u -a6 @pck_name@' to get the list of build requirements. -## AUTOBUILDREQ-END -Requires: kdelibs%{?_kde4_version: >= %{_kde4_version}} - -%description -... - -## remove the devel blocks if this package does not provide development stuff -%package devel -Group: Development/Libraries -Summary: Development files for %{name} -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -Requires: kdelibs-devel - -%description devel -This package contains libraries and header files for developing applications that use %{name}. - -@if:debug_package -%debug_package -@fi:debug_package - -%prep -%setup -q - -%build -%cmake_kde4 -d build -%make - -%install -[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall -C build - -@if:i18n -%find_lang %{name} --all-name --with-kde || touch %{name}.lang -@fi:i18n - -%clean -[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" - -%post -@if:shared_libraries -## remove the following line if no dynamic libraries are provided by this package -/sbin/ldconfig -@fi:shared_libraries -@if:icons_mimetypes -## remove the following line if this package has no hicolor icons -touch --no-create %{_kde4_icondir}/hicolor >/dev/null 2>&1 -## remove the following line if this package has no oxygen icons -touch --no-create %{_kde4_icondir}/oxygen >/dev/null 2>&1 -@fi:icons_mimetypes -exit 0 - -@if:icons_mimetypes -%posttrans -@if:shared_libraries -## remove the following line if no dynamic libraries are provided by this package -/sbin/ldconfig -@fi:shared_libraries -update-desktop-database -q >/dev/null 2>&1 -update-mime-database %{_kde4_mimedir} >/dev/null 2>&1 -## remove the following line if this package has no hicolor icons -gtk-update-icon-cache %{_kde4_icondir}/hicolor >/dev/null 2>&1 -## remove the following line if this package has no oxygen icons -gtk-update-icon-cache %{_kde4_icondir}/oxygen >/dev/null 2>&1 -exit 0 -@fi:icons_mimetypes - -%postun -@if:shared_libraries -## remove the following line if no dynamic libraries are provided by this package -/sbin/ldconfig -@fi:shared_libraries -@if:icons_mimetypes -if [ $1 -eq 0 ]; then -\ update-desktop-database -q >/dev/null 2>&1 -\ update-mime-database %{_kde4_mimedir} >/dev/null 2>&1 -## remove the following two lines if this package has no hicolor icons -\ touch --no-create %{_kde4_icondir}/hicolor >/dev/null 2>&1 -\ gtk-update-icon-cache %{_kde4_icondir}/hicolor >/dev/null 2>&1 -## remove the following two lines if this package has no oxygen icons -\ touch --no-create %{_kde4_icondir}/oxygen >/dev/null 2>&1 -\ gtk-update-icon-cache %{_kde4_icondir}/oxygen >/dev/null 2>&1 -fi -@fi:icons_mimetypes -exit 0 - -@if:i18n -%files -f %{name}.lang -@else:i18n -%files -@fi:i18n -%defattr(-,root,root) -## note: this list is just an example; modify as required -# %{_kde4_bindir}/%{name} -# %{_kde4_datadir}/%{name} -# %{_kde4_dbusinterfacesdir}/org.kde.*.xml -# %{_kde4_kcfgdir}/*.kcfg -# %{_kde4_libdir}/kde4/*.so -# %{_kde4_icondir}/hicolor/*/*/*.png -# %{_kde4_icondir}/oxygen/*/*/*.png -# %{_kde4_icondir}/hicolor/scalable/*/*.svgz -# %{_kde4_icondir}/oxygen/scalable/*/*.svgz -# %{_kde4_xdgappsdir}/%{name}.desktop -# %{_kde4_xdgmimedir}/*.xml -# %{_kde4_servicesdir}/*.desktop -# %{_kde4_servicetypesdir}/*.desktop -# %config %{_kde4_configdir}/*.knsrc -# %doc %lang(en) %{_kde4_htmldir}/en/%{name} -## note: "man3" pages normally goes to devel package if any -# %{_mandir}/man?/%{name}.* -@standard_docs@ -## note: eventually add the remaining documents (if any) -# @standard_docs_devel@ - -## remove this block if the package does not provide development stuff -%files devel -%defattr(-,root,root) -## note: this list is just an example; modify as required -# %{_kde4_includedir}/%{name} -# %{_kde4_libdir}/*.so - -%changelog -* @spec_changelog_date@ @packager_fullname@ <@packager_email@> @pck_version@-@spec_first_release@@DISTRO_rpm@ -- @spec_changelog_comment@