diff options
author | Dario Lombardo <lomato@gmail.com> | 2018-04-15 23:40:36 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2018-04-18 03:46:17 +0000 |
commit | 4a156da068269aae75d79cd08e579754c52a0c43 (patch) | |
tree | 9637e57f0ceaaac66f6c47410c27054106d7d21a /packaging/rpm | |
parent | 2e639570318018871e934fb7a397ba8a2bdcfbe8 (diff) |
Remove autotools build system.
It has been replaced by cmake.
Change-Id: I83a5eddb8645dbbf6bca9f026066d2e995d8e87a
Reviewed-on: https://code.wireshark.org/review/26969
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r-- | packaging/rpm/Makefile.am | 14 | ||||
-rw-r--r-- | packaging/rpm/SPECS/Makefile.am | 2 | ||||
-rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 20 | ||||
-rw-r--r-- | packaging/rpm/wireshark.spec.in | 3 |
4 files changed, 2 insertions, 37 deletions
diff --git a/packaging/rpm/Makefile.am b/packaging/rpm/Makefile.am deleted file mode 100644 index 229f766a04..0000000000 --- a/packaging/rpm/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ - -DIST_SUBDIRS = SPECS - -EXTRA_DIST = wireshark.spec.in - -clean-local: - rm -rf BUILD RPMS SOURCES SRPMS - -all-local: - $(MKDIR_P) BUILD RPMS SOURCES SRPMS - (cd SOURCES && $(LN_S) -f $(abs_top_builddir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.xz .) - $(RPMBUILD) --define "_topdir $(abs_builddir)" --define "_prefix $(prefix)" \ - @RPMBUILD_WITH_ARGS@ --clean -ba SPECS/wireshark.spec - @echo "Package successfully built in `pwd`/RPMS." diff --git a/packaging/rpm/SPECS/Makefile.am b/packaging/rpm/SPECS/Makefile.am deleted file mode 100644 index 27ab46038b..0000000000 --- a/packaging/rpm/SPECS/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -EXTRA_DIST = wireshark.spec.in diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index 77fa26e694..ade0c320c4 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -30,12 +30,6 @@ %global package_version @VERSION@ -# Set this variable to 1 if you have modified this file to patch Wireshark in -# such a way that automake needs to be re-run (e.g., you modified a Makefile.am, -# for example to add a dissector). -# Setting this causes ./autogen.sh to be re-run (which runs automake, etc.). -%global run_automake 0 - Summary: Wireshark is the world's foremost protocol analyzer Name: wireshark @@ -58,13 +52,6 @@ BuildRequires: gcc BuildRequires: python BuildRequires: perl -%if %{run_automake} -BuildRequires: autoconf >= @AC_MIN_VERSION@ -BuildRequires: automake -BuildRequires: flex -BuildRequires: bison -%endif - BuildRequires: glib2-devel >= @GLIB_MIN_VERSION@ Requires: glib2 >= @GLIB_MIN_VERSION@ BuildRequires: libpcap-devel @@ -265,10 +252,6 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %prep %setup -q -n %{name}-%{package_version} -%if %{run_automake} -./autogen.sh -%endif - # Don't specify the prefix here: configure is a macro which expands to set # the prefix and everything else too. If you need to change the prefix # set _prefix (note the underscore) either in this file or on rpmbuild's @@ -429,8 +412,7 @@ fi # This generates a warning because dumpcap is listed twice. That's # probably preferable to listing each program (and keeping the list up to -# date)... Maybe if we can find a way to get the toplevel Makefile.am's -# bin_PROGRAMS in here? +# date)... %if %{use_wireshark_group} && %{setuid_dumpcap} # Setuid but only executable by members of the 'wireshark' group %attr(4750, root, wireshark) %{_bindir}/dumpcap diff --git a/packaging/rpm/wireshark.spec.in b/packaging/rpm/wireshark.spec.in index 613bf1ee93..3c113466c4 100644 --- a/packaging/rpm/wireshark.spec.in +++ b/packaging/rpm/wireshark.spec.in @@ -375,8 +375,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || : # This generates a warning because dumpcap is listed twice. That's # probably preferable to listing each program (and keeping the list up to -# date)... Maybe if we can find a way to get the toplevel Makefile.am's -# bin_PROGRAMS in here? +# date)... %if %{use_wireshark_group} && %{setuid_dumpcap} # Setuid but only executable by members of the 'wireshark' group %attr(4750, root, wireshark) %{_bindir}/dumpcap |