From 517b3a12569c295a03483b16f96cbd4e9528b4ba Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 23 Aug 2017 12:07:17 -0400 Subject: [PATCH] remove distro packaging files let distros provide these, projects should not ref T4991 --- Makefile.am | 6 +-- configure.ac | 1 - enlightenment.spec.in | 96 ---------------------------------- pkgbuild/.gitignore | 2 - pkgbuild/PKGBUILD | 57 -------------------- pkgbuild/enlightenment.install | 12 ----- 6 files changed, 1 insertion(+), 173 deletions(-) delete mode 100644 enlightenment.spec.in delete mode 100644 pkgbuild/.gitignore delete mode 100644 pkgbuild/PKGBUILD delete mode 100644 pkgbuild/enlightenment.install diff --git a/Makefile.am b/Makefile.am index dba49f1db..a03bc50b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,11 +38,7 @@ config.rpath \ README \ AUTHORS \ COPYING \ -enlightenment.spec.in \ -enlightenment.spec \ -enlightenment.pc \ -pkgbuild/PKGBUILD \ -pkgbuild/enlightenment.install +enlightenment.pc include m4/Makefile.mk diff --git a/configure.ac b/configure.ac index 07021c435..893551a4e 100644 --- a/configure.ac +++ b/configure.ac @@ -1056,7 +1056,6 @@ AC_SUBST([SUID_LDFLAGS]) AC_OUTPUT([ Makefile -enlightenment.spec enlightenment.pc src/bin/e_fm_shared_types.h src/modules/everything/everything.pc diff --git a/enlightenment.spec.in b/enlightenment.spec.in deleted file mode 100644 index 69e729dc4..000000000 --- a/enlightenment.spec.in +++ /dev/null @@ -1,96 +0,0 @@ -%define __os_install_post /usr/lib/rpm/brp-compress -%define debug_package %{nil} -%{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}} -%define _missing_doc_files_terminate_build 0 - -%if %(systemctl --version | head -1 | cut -d' ' -f2) >= 209 -%{expand:%%global have_systemd 1} -%endif - -%{expand:%%global ac_enable_systemd --%{?have_systemd:en}%{!?have_systemd:dis}able-systemd} - -Summary: The Enlightenment window manager -Name: @PACKAGE@ -Version: @VERSION@ -Release: %{_rel} -License: BSD -Group: User Interface/Desktops -URL: http://www.enlightenment.org/ -Source: ftp://ftp.enlightenment.org/pub/enlightenment/%{name}-%{version}.tar.gz -Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings } -Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} -Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} -#BuildSuggests: xorg-x11-devel, XFree86-devel, libX11-devel -BuildRequires: efl-devel >= @efl_version@ -BuildRequires: libxcb-devel, xcb-util-devel -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-root - -%description -Enlightenment is a window manager. - - -%package devel -Summary: Development headers for Enlightenment. -Group: User Interface/Desktops -Requires: %{name} = %{version} -Requires: efl-devel >= @efl_version@ - -%description devel -Development headers for Enlightenment. - - -%prep -%setup -q - - -%build -%{configure} --prefix=%{_prefix} %{ac_enable_systemd} --with-profile=FAST_PC CFLAGS="-O0 -ggdb3" -%{__make} %{?_smp_mflags} %{?mflags} - - -%install -%{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install -test -x `which doxygen` && sh gendoc || : -find $RPM_BUILD_ROOT%{_prefix} -name '*.la' -print0 | xargs -0 rm -f - -%{find_lang} %{name} - - -%clean -test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT - - -%post -/sbin/ldconfig - - -%postun -/sbin/ldconfig - - -%files -f %{name}.lang -%defattr(-, root, root) -%doc AUTHORS COPYING README -%dir %{_sysconfdir}/enlightenment -%config(noreplace) %{_sysconfdir}/enlightenment/* -%config(noreplace) %{_sysconfdir}/xdg/menus/e-applications.menu -%{_bindir}/emixer -%{_bindir}/enlightenment -%{_bindir}/enlightenment_* -%{_libdir}/%{name}/ -%{_datadir}/%{name}/ -%{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/e* -%{_datadir}/xsessions/%{name}.desktop -%if %{?have_systemd:1}0 -%{_prefix}/lib/systemd/*/*.service -%endif - -%files devel -%defattr(-, root, root) -%{_includedir}/enlightenment/ -%{_libdir}/pkgconfig/*.pc - - -%changelog diff --git a/pkgbuild/.gitignore b/pkgbuild/.gitignore deleted file mode 100644 index da5b08f95..000000000 --- a/pkgbuild/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.tar.xz -pkg diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD deleted file mode 100644 index 6905e1692..000000000 --- a/pkgbuild/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Maintainer: Enlightenment Developers > -pkgname=enlightenment -[[ -d ../.git ]] && pkgname=$pkgname-git -pkgver=0.18.0rc2.17432.569bc2e -pkgrel=1 -pkgdesc="Enlightenment window manager - GIT development snapshot" -arch=('i686' 'x86_64' 'arm') -url="http://www.enlightenment.org" -license=('BSD') -depends=('elementary' 'xcb-util-keysyms' 'hicolor-icon-theme' 'pixman' 'mesa' - 'desktop-file-utils' 'udisks2' 'ttf-font' 'bluez-libs' 'bluez4') -optdepends=('connman: network module' - 'acpid: power events on laptop lid close' - 'gdb: create backtraces on crash') -[[ -d ../.git ]] && makedepends=('git') -provides=("enlightenment=$pkgver" "enlightenment17=$pkgver" 'notification-daemon') -conflicts=('enlightenment<1.0' 'enlightenment17') -backup=('etc/enlightenment/sysactions.conf' - 'etc/xdg/menus/enlightenment.menu') -options=('debug') -install=enlightenment.install - -pkgver() { - cd "../.." - - if [[ -d .git ]]; then - for _i in v_maj v_min v_mic; do - local v_ver=$v_ver.$(grep -m1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*") - done - - v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac) - - printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" - else - ./configure --version | awk '/^enlightenment/ {gsub("-", ""); print $NF}' - fi -} - -build() { - cd "../.." - export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer" - [[ -e Makefile ]] && make clean distclean - [[ -e autogen.sh ]] && _configure=autogen.sh || _configure=configure - ./$_configure --prefix=/usr --sysconfdir=/etc --enable-wayland-clients --enable-wayland-egl - make -} - -package() { - cd "../.." - make -j1 DESTDIR="$pkgdir" install - install -Dm644 AUTHORS "$pkgdir/usr/share/doc/${pkgname%-*}/AUTHORS" - install -Dm644 ChangeLog "$pkgdir/usr/share/doc/${pkgname%-*}/ChangeLog" - install -Dm644 NEWS "$pkgdir/usr/share/doc/${pkgname%-*}/NEWS" - install -Dm644 README "$pkgdir/usr/share/doc/${pkgname%-*}/README" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - ln -sf "../../licenses/$pkgname/COPYING" "$pkgdir/usr/share/doc/${pkgname%-*}/COPYING" -} diff --git a/pkgbuild/enlightenment.install b/pkgbuild/enlightenment.install deleted file mode 100644 index 1182e768f..000000000 --- a/pkgbuild/enlightenment.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime > /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}