diff --git a/Makefile.am b/Makefile.am index 4fa80ead..653c4091 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,17 +30,7 @@ EXTRA_DIST = bootstrap.sh LICENSE \ README.md ASSIGNMENT_OF_COPYRIGHT.pdf \ Changelog \ python-prefix.py revision.sh \ - .version .version.date \ - packaging/deb/compat \ - packaging/deb/copyright \ - packaging/deb/changelog \ - packaging/deb/rules \ - packaging/deb/control \ - packaging/deb/core-daemon.install.in \ - packaging/deb/core-daemon.prerm.in \ - packaging/deb/core-gui.install.in \ - packaging/rpm/core.spec.in \ - packaging/rpm/specfiles.sh + .version .version.date DISTCLEAN_TARGETS = aclocal.m4 config.h.in @@ -51,25 +41,6 @@ MAINTAINERCLEANFILES = \ .version \ .version.date -# build a source RPM -.PHONY: rpm -rpm: dist - mkdir -p $(HOME)/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} - echo '%_topdir $(HOME)/rpmbuild' > ~/.rpmmacros - cp -afv core-@CORE_VERSION@.tar.gz ~/rpmbuild/SOURCES - cp -afv packaging/rpm/core.spec ~/rpmbuild/SPECS - rpmbuild -bs ~/rpmbuild/SPECS/core.spec - -# build a Ubuntu deb package using CDBS -.PHONY: deb -deb: - rm -rf debian - mkdir -p debian - cp -vf packaging/deb/* debian/ - @echo "First create source archive with: dpkg-source -b core-@CORE_VERSION@" - @echo "Then build with: pbuilder-dist precise i386 build core*.dsc" - - define fpm-python = fpm -s python -t $1 \ -m "$(CORE_MAINTAINERS)" \ diff --git a/configure.ac b/configure.ac index e643110d..12d90cda 100644 --- a/configure.ac +++ b/configure.ac @@ -320,11 +320,7 @@ AC_CONFIG_FILES([Makefile netns/Makefile netns/version.h ns3/Makefile - ns3/corens3/constants.py - packaging/deb/core-daemon.install - packaging/deb/core-daemon.prerm - packaging/deb/core-gui.install - packaging/rpm/core.spec],) + ns3/corens3/constants.py],) AC_OUTPUT # Summary text diff --git a/doc/devguide.rst b/doc/devguide.rst index 9b703cca..bfb3aa37 100644 --- a/doc/devguide.rst +++ b/doc/devguide.rst @@ -37,7 +37,6 @@ These are being actively developed as of CORE |version|: * *netns* - Python extension modules for Linux Network Namespace support are in :file:`netns`. * *ns3* - Python ns3 script support for running CORE. * *doc* - Documentation for the manual lives here in reStructuredText format. -* *packaging* - Control files and script for building CORE packages are here. .. _The_CORE_API: diff --git a/packaging/deb.mk b/packaging/deb.mk deleted file mode 100644 index 14116c12..00000000 --- a/packaging/deb.mk +++ /dev/null @@ -1,56 +0,0 @@ -DEBBUILD = .debbuild - -CORE_VERSION = $(shell cat .version 2> /dev/null) - -COREBUILD = $(DEBBUILD)/core-$(CORE_VERSION) - -.PHONY: all -all: clean .version build - -.PHONY: clean -clean: - rm -rf $(DEBBUILD) - -.PHONY: build -build: changelog - cd $(COREBUILD) && dpkg-buildpackage -b -us -uc - @printf "\ndebian packages built in $(DEBBUILD)\n\n" - -.PHONY: changelog -changelog: debian - echo "core ($(CORE_VERSION)-1) unstable; urgency=low" > $(COREBUILD)/debian/changelog.generated - echo " * interim package generated from source" >> $(COREBUILD)/debian/changelog.generated - echo " -- CORE Developers $$(date -R)" >> $(COREBUILD)/debian/changelog.generated - cd $(COREBUILD)/debian && \ - { test ! -L changelog && mv -f changelog changelog.save; } && \ - { test "$$(readlink changelog)" = "changelog.generated" || \ - ln -sf changelog.generated changelog; } - -.PHONY: debian -debian: corebuild - cd $(COREBUILD) && ln -s packaging/deb debian - -.PHONY: corebuild -corebuild: $(DEBBUILD) dist - tar -C $(DEBBUILD) -xzf core-$(CORE_VERSION).tar.gz - -.PHONY: dist -dist: Makefile - $(MAKE) dist - -Makefile: configure - ./configure - -configure: bootstrap.sh - ./bootstrap.sh - -bootstrap.sh: - @printf "\nERROR: make must be called from the top-level directory:\n" - @printf " make -f packaging/$(lastword $(MAKEFILE_LIST))\n\n" - @false - -.version: Makefile - $(MAKE) $@ - -$(DEBBUILD): - mkdir -p $@ diff --git a/packaging/deb/.gitignore b/packaging/deb/.gitignore deleted file mode 100644 index 790c34ec..00000000 --- a/packaging/deb/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -core-daemon.install -core-gui.install -core-daemon.prerm diff --git a/packaging/deb/changelog b/packaging/deb/changelog deleted file mode 100644 index fa84b69b..00000000 --- a/packaging/deb/changelog +++ /dev/null @@ -1,65 +0,0 @@ -core (5.0-0ubuntu1) precise; urgency=low - - * Added Ryu SD and Open vSwitch services, code cleanup and refactoring - - -- CORE Developers Fri, 01 Sep 2017 00:00:00 -0700 - -core (4.8-0ubuntu1) precise; urgency=low - - * Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes - - -- CORE Developers Fri, 05 Jun 2015 00:00:00 -0700 - -core (4.7-0ubuntu1) precise; urgency=low - - * EMANE 0.9.1, asymmetric links, bugfixes - - -- Jeff Ahrenholz Wed, 08 Aug 2014 08:27:18 -0700 - -core (4.6-0ubuntu1) precise; urgency=low - - * Edit Copy and Paste, Edit Find, bugfixes, Debian compliance - - -- Jeff Ahrenholz Wed, 25 Sep 2013 12:36:54 -0700 - -core (4.5-0ubuntu1) precise; urgency=low - - * XML support, SDT3D support, EMANE 0.8.1, ns-3 locations, code cleanup, - bugfixes, and more. - - -- Jeff Ahrenholz Thu, 11 Apr 2013 14:19:05 -0700 - -core (4.4-0ubuntu1) precise; urgency=low - - * Bandwidth plots, event scheduling, EMANE 0.7.4, improved services support, - code cleanup, bugfixes, and more. - - -- Jeff Ahrenholz Tue, 04 Sep 2012 11:53:23 -0700 - -core (4.3-0ubuntu1) oneiric; urgency=low - - * Hook scripts, CEL, EMANE 0.7.3, physical nodes, improved WLAN and service - dialogs, code cleanup, bugfixes, and more. - - -- Jeff Ahrenholz Thu, 09 Feb 2012 08:00:52 -0800 - -core (4.2-0ubuntu1) maverick; urgency=low - - * bugfixes, EMANE 0.7.1 support. - - -- Jeff Ahrenholz Mon, 15 Aug 2011 13:19:16 -0800 - -core (4.1-0ubuntu1) lucid; urgency=low - - * Node services, customizable nodes, traffic flows, IP address allocator, - distributed emulation using GRE tunnels, EMANE 0.6.4 support, and more. - - -- Jeff Ahrenholz Thu, 09 Dec 2010 07:02:16 -0800 - -core (4.0-0ubuntu1) lucid; urgency=low - - * New CORE deb packaging. Extra magic added to omit the horrible - /usr/share/info/dir.gz file from being generated. - - -- Jeff Ahrenholz Wed, 29 Jul 2010 16:07:26 -0700 - diff --git a/packaging/deb/compat b/packaging/deb/compat deleted file mode 100644 index ec635144..00000000 --- a/packaging/deb/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/packaging/deb/control b/packaging/deb/control deleted file mode 100644 index 15caa7a3..00000000 --- a/packaging/deb/control +++ /dev/null @@ -1,28 +0,0 @@ -Source: core -Section: net -Priority: optional -Maintainer: CORE Developers -Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 9), cdbs, dh-autoreconf, autoconf, automake, gcc, libev-dev, make, python-dev, libreadline-dev, bridge-utils, ebtables, iproute2 | iproute, imagemagick, pkg-config, help2man -# python-sphinx -Homepage: http://www.nrl.navy.mil/itd/ncs/products/core - -Package: core-daemon -Architecture: any -Depends: bash (>=3.0), bridge-utils, ebtables, iproute2 | iproute, libev4, python (>=2.6), dpkg (>=1.15.4), procps, ${shlibs:Depends} -Recommends: quagga -Description: Emulate virtual networks in a box. - The Common Open Research Emulator provides Python modules for building virtual - networks using Linux network namespace containers and bridging. This is the - daemon package containing the backend Python modules and core-daemon. - -Package: core-gui -Architecture: all -Depends: bash (>=3.0), tcl (>= 8.5), tk (>= 8.5), xterm -Recommends: libtk-img -Description: Emulate virtual networks in a box. - The Common Open Research Emulator provides Python modules for building virtual - networks using Linux network namespace containers and bridging. This is the - GUI package containing a canvas-based Tcl/Tk GUI for easily drawing virtual - network topologies. - diff --git a/packaging/deb/copyright b/packaging/deb/copyright deleted file mode 100644 index 04f2a7bd..00000000 --- a/packaging/deb/copyright +++ /dev/null @@ -1,35 +0,0 @@ -This package was debianized by Jeff Ahrenholz -4/3/13 - -It was downloaded from: http://www.nrl.navy.mil/itd/ncs/products/core - -Upstream Author(s): Jeff Ahrenholz - -Copyright: - Copyright (C) 2010-2013, the Boeing Company. - -License: - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -Packaging: - Copyright (C) 2010-2013, the Boeing Company. diff --git a/packaging/deb/core-daemon.install.in b/packaging/deb/core-daemon.install.in deleted file mode 100644 index 8dda2c9c..00000000 --- a/packaging/deb/core-daemon.install.in +++ /dev/null @@ -1,19 +0,0 @@ -#! /usr/bin/dh-exec -@SBINDIR@ -@CORE_CONF_DIR@ -@CORE_DATA_DIR@/examples/corens3 -@CORE_DATA_DIR@/examples/*.py -@CORE_DATA_DIR@/examples/hooks -@CORE_DATA_DIR@/examples/myservices -@CORE_DATA_DIR@/examples/netns -@CORE_DATA_DIR@/examples/services -# ATmandirAT is expanding to ${datarootdir}/man -@datarootdir@/man/man1/vnoded.1 -@datarootdir@/man/man1/vcmd.1 -@datarootdir@/man/man1/netns.1 -@datarootdir@/man/man1/core-daemon.1 -@datarootdir@/man/man1/coresendmsg.1 -@datarootdir@/man/man1/core-cleanup.1 -@pyprefix@/lib/python2.7/dist-packages -/etc/init.d -/etc/logrotate.d diff --git a/packaging/deb/core-daemon.prerm.in b/packaging/deb/core-daemon.prerm.in deleted file mode 100644 index e8f134a9..00000000 --- a/packaging/deb/core-daemon.prerm.in +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -SBINDIR=@SBINDIR@ -pyprefix=@pyprefix@ -pythondir=@pythondir@ - -core_daemon_stop() -{ - if [ -x /etc/init.d/core-daemon ]; then - /etc/init.d/core-daemon stop - fi - - if [ -x $SBINDIR/core-cleanup ]; then - $SBINDIR/core-cleanup - fi - - if [ -d $pythondir/core ]; then - find $pythondir/core -name '*.pyc' -delete - fi -} - -case "$1" in - remove|upgrade|deconfigure) - core_daemon_stop > /dev/null 2>&1 - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/packaging/deb/core-gui.install.in b/packaging/deb/core-gui.install.in deleted file mode 100644 index 89bbc19c..00000000 --- a/packaging/deb/core-gui.install.in +++ /dev/null @@ -1,9 +0,0 @@ -#! /usr/bin/dh-exec -@BINDIR@/core-gui -@CORE_LIB_DIR@ -@CORE_DATA_DIR@/icons -@CORE_DATA_DIR@/examples/configs -@datarootdir@/pixmaps -@datarootdir@/applications -# ATmandirAT is expanding to ${datarootdir}/man -@datarootdir@/man/man1/core-gui.1 diff --git a/packaging/deb/rules b/packaging/deb/rules deleted file mode 100755 index d26bee7e..00000000 --- a/packaging/deb/rules +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/make -f - -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -# DH_VERBOSE = 1 - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/autoreconf.mk - -DEB_DH_AUTORECONF_ARGS += ./bootstrap.sh - -# this prevents 'make install' from invoking install-info that generates a -# $(DEB_DESTDIR)usr/share/info/dir.gz file that causes a lintian error -# the following rule was not enough -# binary-post-install/core:: -# rm -f $(DEB_DESTDIR)usr/share/info/dir.gz -#DEB_CONFIGURE_EXTRA_FLAGS := --disable-install-info diff --git a/packaging/rpm.mk b/packaging/rpm.mk deleted file mode 100644 index cb70c141..00000000 --- a/packaging/rpm.mk +++ /dev/null @@ -1,40 +0,0 @@ -RPMBUILD = .rpmbuild - -CORE_VERSION = $(shell cat .version 2> /dev/null) - -.PHONY: all -all: clean .version build - -.PHONY: clean -clean: - rm -rf $(RPMBUILD) - -.PHONY: build -build: dist - for d in SOURCES SPECS; do mkdir -p $(RPMBUILD)/$$d; done - cp -afv core-$(CORE_VERSION).tar.gz $(RPMBUILD)/SOURCES - cp -afv packaging/rpm/core.spec $(RPMBUILD)/SPECS - rpmbuild -bb --clean $(RPMBUILD)/SPECS/core.spec \ - --define "_topdir $$PWD/.rpmbuild" - @printf "\nRPM packages saved in $(RPMBUILD)/RPMS\n\n" - -.PHONY: dist -dist: Makefile - $(MAKE) dist - -Makefile: configure - ./configure --prefix=/usr --exec-prefix=/usr - -configure: bootstrap.sh - ./bootstrap.sh - -bootstrap.sh: - @printf "\nERROR: make must be called from the top-level directory:\n" - @printf " make -f packaging/$(lastword $(MAKEFILE_LIST))\n\n" - @false - -.version: Makefile - $(MAKE) $@ - -$(RPMBUILD): - mkdir -p $@ diff --git a/packaging/rpm/.gitignore b/packaging/rpm/.gitignore deleted file mode 100644 index c40ee150..00000000 --- a/packaging/rpm/.gitignore +++ /dev/null @@ -1 +0,0 @@ -core.spec diff --git a/packaging/rpm/core.spec.in b/packaging/rpm/core.spec.in deleted file mode 100644 index 90266115..00000000 --- a/packaging/rpm/core.spec.in +++ /dev/null @@ -1,424 +0,0 @@ -%define version @PACKAGE_VERSION@ -%define lib_version @GENERIC_RELEASE@ -%define python_version %(%{__python} -c "import sys; print '%s.%s' % (sys.version_info[0], sys.version_info[1])")%{nil} - -%if 0%{?fedora} >= 17 -%define with_kernel_modules_extra 1 -%else -%define with_kernel_modules_extra 0 -%endif - -Name: core -Summary: Common Open Research Emulator for use with network namespaces -License: BSD -Prefix: /usr -Release: 1%{?dist} -Source: core-%{version}.tar.gz -URL: http://www.nrl.navy.mil/itd/ncs/products/core -Version: %{version} -%description -The Common Open Research Emulator provides Python modules and a GUI for -building virtual networks using Linux network namespace containers and bridging. - -%package daemon -Summary: Common Open Research Emulator daemon back-end -Group: System Tools -Requires: bash bridge-utils ebtables iproute libev python net-tools -%if 0%{?el6} -Requires: procps -%else -Requires: procps-ng -%endif -%if %{with_kernel_modules_extra} -Requires: kernel-modules-extra -%endif -%if 0%{?fedora} >= 25 -Requires: iproute-tc -%endif -BuildRequires: make automake autoconf libev-devel python-devel bridge-utils ebtables iproute net-tools ImageMagick help2man -%if 0%{?el6} -BuildRequires: procps -%else -BuildRequires: procps-ng -%endif -%if 0%{?fedora} >= 25 -BuildRequires: iproute-tc -%endif -Provides: core-daemon -# python-sphinx -%description daemon -The Common Open Research Emulator provides Python modules for building virtual -networks using Linux network namespace containers and bridging. - -%package gui -Summary: Common Open Research Emulator GUI front-end -Group: System Tools -Requires: tcl tk xterm -BuildArch: noarch -BuildRequires: make automake autoconf -Provides: core-gui -%description gui -The Common Open Research Emulator canvas-based Tcl/Tk GUI for easily drawing -virtual network topologies. - -%prep - -%setup -q - -%build - -./bootstrap.sh -# not using --disable-gui/--disable-daemon, because RPM expects both to be -# installed by this build process -# assume Fedora, using systemd startup script -CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS" %configure --with-startup=systemd -make -j4 - -%install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install - -%clean -rm -rf $RPM_BUILD_ROOT - -%post - -%post daemon -# don't run EMANE with realtime option under Fedora -sed -i 's/emane_realtime = True/emane_realtime = False/' /etc/core/core.conf - -%preun daemon -if [ "$1" -eq 0 ]; then - systemctl stop core-daemon.service > /dev/null 2>&1 || true - - if [ -x @SBINDIR@/core-cleanup ]; then - @SBINDIR@/core-cleanup > /dev/null 2>&1 || true - fi -fi - -%postun - -%files gui -%{_bindir}/core-gui -%dir @CORE_LIB_DIR@ -%dir @CORE_LIB_DIR@/addons -@CORE_LIB_DIR@/addons/ipsecservice.tcl -@CORE_LIB_DIR@/annotations.tcl -@CORE_LIB_DIR@/api.tcl -@CORE_LIB_DIR@/canvas.tcl -@CORE_LIB_DIR@/cfgparse.tcl -@CORE_LIB_DIR@/core-bsd-cleanup.sh -@CORE_LIB_DIR@/core.tcl -@CORE_LIB_DIR@/debug.tcl -@CORE_LIB_DIR@/editor.tcl -@CORE_LIB_DIR@/exceptions.tcl -@CORE_LIB_DIR@/exec.tcl -@CORE_LIB_DIR@/filemgmt.tcl -@CORE_LIB_DIR@/gpgui.tcl -@CORE_LIB_DIR@/graph_partitioning.tcl -@CORE_LIB_DIR@/help.tcl -%{_datadir}/applications/core-gui.desktop -%{_datadir}/pixmaps/core-gui.xpm -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/icons -%dir %{_datadir}/%{name}/icons/normal -%{_datadir}/%{name}/icons/normal/antenna.gif -%{_datadir}/%{name}/icons/normal/ap.gif -%{_datadir}/%{name}/icons/normal/core-icon.png -%{_datadir}/%{name}/icons/normal/core-icon.xbm -%{_datadir}/%{name}/icons/normal/core-logo-275x75.gif -%{_datadir}/%{name}/icons/normal/document-properties.gif -%{_datadir}/%{name}/icons/normal/gps-diagram.xbm -%{_datadir}/%{name}/icons/normal/host.gif -%{_datadir}/%{name}/icons/normal/hub.gif -%{_datadir}/%{name}/icons/normal/lanswitch.gif -%{_datadir}/%{name}/icons/normal/mdr.gif -%{_datadir}/%{name}/icons/normal/oval.gif -%{_datadir}/%{name}/icons/normal/pc.gif -%{_datadir}/%{name}/icons/normal/rj45.gif -%{_datadir}/%{name}/icons/normal/router_black.gif -%{_datadir}/%{name}/icons/normal/router.gif -%{_datadir}/%{name}/icons/normal/router_green.gif -%{_datadir}/%{name}/icons/normal/router_purple.gif -%{_datadir}/%{name}/icons/normal/router_red.gif -%{_datadir}/%{name}/icons/normal/router_yellow.gif -%{_datadir}/%{name}/icons/normal/simple.xbm -%{_datadir}/%{name}/icons/normal/text.gif -%{_datadir}/%{name}/icons/normal/thumb-unknown.gif -%{_datadir}/%{name}/icons/normal/tunnel.gif -%{_datadir}/%{name}/icons/normal/wlan.gif -%dir %{_datadir}/%{name}/icons/svg -%{_datadir}/%{name}/icons/svg/ap.svg -%{_datadir}/%{name}/icons/svg/cel.svg -%{_datadir}/%{name}/icons/svg/hub.svg -%{_datadir}/%{name}/icons/svg/lanswitch.svg -%{_datadir}/%{name}/icons/svg/mdr.svg -%{_datadir}/%{name}/icons/svg/otr.svg -%{_datadir}/%{name}/icons/svg/rj45.svg -%{_datadir}/%{name}/icons/svg/router_black.svg -%{_datadir}/%{name}/icons/svg/router_green.svg -%{_datadir}/%{name}/icons/svg/router_purple.svg -%{_datadir}/%{name}/icons/svg/router_red.svg -%{_datadir}/%{name}/icons/svg/router.svg -%{_datadir}/%{name}/icons/svg/router_yellow.svg -%{_datadir}/%{name}/icons/svg/start.svg -%{_datadir}/%{name}/icons/svg/tunnel.svg -%{_datadir}/%{name}/icons/svg/vlan.svg -%dir %{_datadir}/%{name}/icons/tiny -%{_datadir}/%{name}/icons/tiny/ap.gif -%{_datadir}/%{name}/icons/tiny/arrow.down.gif -%{_datadir}/%{name}/icons/tiny/arrow.gif -%{_datadir}/%{name}/icons/tiny/arrow.up.gif -%{_datadir}/%{name}/icons/tiny/blank.gif -%{_datadir}/%{name}/icons/tiny/button.play.gif -%{_datadir}/%{name}/icons/tiny/button.stop.gif -%{_datadir}/%{name}/icons/tiny/cel.gif -%{_datadir}/%{name}/icons/tiny/delete.gif -%{_datadir}/%{name}/icons/tiny/document-new.gif -%{_datadir}/%{name}/icons/tiny/document-properties.gif -%{_datadir}/%{name}/icons/tiny/document-save.gif -%{_datadir}/%{name}/icons/tiny/edit-delete.gif -%{_datadir}/%{name}/icons/tiny/eraser.gif -%{_datadir}/%{name}/icons/tiny/fileopen.gif -%{_datadir}/%{name}/icons/tiny/folder.gif -%{_datadir}/%{name}/icons/tiny/host.gif -%{_datadir}/%{name}/icons/tiny/hub.gif -%{_datadir}/%{name}/icons/tiny/lanswitch.gif -%{_datadir}/%{name}/icons/tiny/link.gif -%{_datadir}/%{name}/icons/tiny/marker.gif -%{_datadir}/%{name}/icons/tiny/mdr.gif -%{_datadir}/%{name}/icons/tiny/mobility.gif -%{_datadir}/%{name}/icons/tiny/moboff.gif -%{_datadir}/%{name}/icons/tiny/observe.gif -%{_datadir}/%{name}/icons/tiny/oval.gif -%{_datadir}/%{name}/icons/tiny/pc.gif -%{_datadir}/%{name}/icons/tiny/ping.gif -%{_datadir}/%{name}/icons/tiny/plot.gif -%{_datadir}/%{name}/icons/tiny/rectangle.gif -%{_datadir}/%{name}/icons/tiny/rj45.gif -%{_datadir}/%{name}/icons/tiny/router_black.gif -%{_datadir}/%{name}/icons/tiny/router.gif -%{_datadir}/%{name}/icons/tiny/router_green.gif -%{_datadir}/%{name}/icons/tiny/router_purple.gif -%{_datadir}/%{name}/icons/tiny/router_red.gif -%{_datadir}/%{name}/icons/tiny/router_yellow.gif -%{_datadir}/%{name}/icons/tiny/run.gif -%{_datadir}/%{name}/icons/tiny/script_pause.gif -%{_datadir}/%{name}/icons/tiny/script_play.gif -%{_datadir}/%{name}/icons/tiny/script_stop.gif -%{_datadir}/%{name}/icons/tiny/select.gif -%{_datadir}/%{name}/icons/tiny/start.gif -%{_datadir}/%{name}/icons/tiny/stock_connect.gif -%{_datadir}/%{name}/icons/tiny/stock_disconnect.gif -%{_datadir}/%{name}/icons/tiny/stop.gif -%{_datadir}/%{name}/icons/tiny/text.gif -%{_datadir}/%{name}/icons/tiny/trace.gif -%{_datadir}/%{name}/icons/tiny/tunnel.gif -%{_datadir}/%{name}/icons/tiny/twonode.gif -%{_datadir}/%{name}/icons/tiny/view-refresh.gif -%{_datadir}/%{name}/icons/tiny/wlan.gif -@CORE_LIB_DIR@/initgui.tcl -@CORE_LIB_DIR@/ipv4.tcl -@CORE_LIB_DIR@/ipv6.tcl -@CORE_LIB_DIR@/linkcfg.tcl -@CORE_LIB_DIR@/mobility.tcl -@CORE_LIB_DIR@/nodecfg.tcl -@CORE_LIB_DIR@/nodes.tcl -@CORE_LIB_DIR@/ns2imunes.tcl -@CORE_LIB_DIR@/plugins.tcl -@CORE_LIB_DIR@/services.tcl -@CORE_LIB_DIR@/tooltips.tcl -@CORE_LIB_DIR@/topogen.tcl -@CORE_LIB_DIR@/traffic.tcl -@CORE_LIB_DIR@/util.tcl -@CORE_LIB_DIR@/version.tcl -@CORE_LIB_DIR@/widget.tcl -@CORE_LIB_DIR@/wlanscript.tcl -@CORE_LIB_DIR@/wlan.tcl -%dir %{_datadir}/%{name}/examples -%dir %{_datadir}/%{name}/examples/configs -%{_datadir}/%{name}/examples/configs/sample10-kitchen-sink.imn -%{_datadir}/%{name}/examples/configs/sample1-bg.gif -%{_datadir}/%{name}/examples/configs/sample1.imn -%{_datadir}/%{name}/examples/configs/sample1.scen -%{_datadir}/%{name}/examples/configs/sample2-ssh.imn -%{_datadir}/%{name}/examples/configs/sample3-bgp.imn -%{_datadir}/%{name}/examples/configs/sample4-bg.jpg -%{_datadir}/%{name}/examples/configs/sample4-nrlsmf.imn -%{_datadir}/%{name}/examples/configs/sample4.scen -%{_datadir}/%{name}/examples/configs/sample5-mgen.imn -%{_datadir}/%{name}/examples/configs/sample6-emane-rfpipe.imn -%{_datadir}/%{name}/examples/configs/sample7-emane-ieee80211abg.imn -%{_datadir}/%{name}/examples/configs/sample8-ipsec-service.imn -%{_datadir}/%{name}/examples/configs/sample9-vpn.imn -%doc %{_mandir}/man1/core-gui.1.gz - -%files daemon -%config @CORE_CONF_DIR@/core.conf -%config @CORE_CONF_DIR@/perflogserver.conf -%dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/examples -%{_datadir}/%{name}/examples/controlnet_updown -%dir %{_datadir}/%{name}/examples/corens3 -%{_datadir}/%{name}/examples/corens3/ns3lte.py* -%{_datadir}/%{name}/examples/corens3/ns3wifi.py* -%{_datadir}/%{name}/examples/corens3/ns3wifirandomwalk.py* -%{_datadir}/%{name}/examples/corens3/ns3wimax.py* -%{_datadir}/%{name}/examples/emanemanifest2core.py* -%{_datadir}/%{name}/examples/emanemodel2core.py* -%{_datadir}/%{name}/examples/findcore.py* -%dir %{_datadir}/%{name}/examples/hooks -%{_datadir}/%{name}/examples/hooks/configuration_hook.sh -%{_datadir}/%{name}/examples/hooks/datacollect_hook.sh -%{_datadir}/%{name}/examples/hooks/perflogserver.py* -%{_datadir}/%{name}/examples/hooks/perflogstart.sh -%{_datadir}/%{name}/examples/hooks/perflogstop.sh -%{_datadir}/%{name}/examples/hooks/sessiondatacollect.sh -%{_datadir}/%{name}/examples/hooks/timesyncstart.sh -%{_datadir}/%{name}/examples/hooks/timesyncstop.sh -%dir %{_datadir}/%{name}/examples/myservices -%{_datadir}/%{name}/examples/myservices/__init__.py* -%{_datadir}/%{name}/examples/myservices/README.txt -%{_datadir}/%{name}/examples/myservices/sample.py* -%dir %{_datadir}/%{name}/examples/netns -%{_datadir}/%{name}/examples/netns/basicrange.py* -%{_datadir}/%{name}/examples/netns/daemonnodes.py* -%{_datadir}/%{name}/examples/netns/distributed.py* -%{_datadir}/%{name}/examples/netns/emane80211.py* -%{_datadir}/%{name}/examples/netns/howmanynodes.py* -%{_datadir}/%{name}/examples/netns/iperf-performance-chain.py* -%{_datadir}/%{name}/examples/netns/iperf-performance.sh -%{_datadir}/%{name}/examples/netns/ospfmanetmdrtest.py* -%{_datadir}/%{name}/examples/netns/switch.py* -%{_datadir}/%{name}/examples/netns/switchtest.py* -%{_datadir}/%{name}/examples/netns/twonodes.sh -%{_datadir}/%{name}/examples/netns/wlanemanetests.py* -%{_datadir}/%{name}/examples/netns/wlantest.py* -%dir %{_datadir}/%{name}/examples/services -%{_datadir}/%{name}/examples/services/sampleFirewall -%{_datadir}/%{name}/examples/services/sampleIPsec -%{_datadir}/%{name}/examples/services/sampleVPNClient -%{_datadir}/%{name}/examples/services/sampleVPNServer -%{_datadir}/%{name}/examples/stopsession.py* -%doc %{_mandir}/man1/core-cleanup.1.gz -%doc %{_mandir}/man1/core-daemon.1.gz -%doc %{_mandir}/man1/core-manage.1.gz -%doc %{_mandir}/man1/coresendmsg.1.gz -%doc %{_mandir}/man1/netns.1.gz -%doc %{_mandir}/man1/vcmd.1.gz -%doc %{_mandir}/man1/vnoded.1.gz -/etc/logrotate.d/core-daemon -/etc/systemd/system/core-daemon.service -%{python_sitearch}/core_python_netns-1.0-py%{python_version}.egg-info -%{python_sitearch}/netns.so -%{python_sitearch}/vcmd.so -%dir %{python_sitelib}/core -%{python_sitelib}/core/sdt.py* -%{python_sitelib}/core/service.py* -%{python_sitelib}/core/coreserver.py* -%dir %{python_sitelib}/core/api -%{python_sitelib}/core/api/coreapi.py* -%{python_sitelib}/core/api/data.py* -%{python_sitelib}/core/api/__init__.py* -%{python_sitelib}/core/broker.py* -%dir %{python_sitelib}/core/bsd -%{python_sitelib}/core/bsd/__init__.py* -%{python_sitelib}/core/bsd/netgraph.py* -%{python_sitelib}/core/bsd/nodes.py* -%{python_sitelib}/core/bsd/vnet.py* -%{python_sitelib}/core/bsd/vnode.py* -%{python_sitelib}/core/conf.py* -%{python_sitelib}/core/constants.py* -%{python_sitelib}/core/coreobj.py* -%dir %{python_sitelib}/core/emane -%{python_sitelib}/core/emane/bypass.py* -%{python_sitelib}/core/emane/commeffect.py* -%{python_sitelib}/core/emane/emane.py* -%{python_sitelib}/core/emane/ieee80211abg.py* -%{python_sitelib}/core/emane/__init__.py* -%{python_sitelib}/core/emane/nodes.py* -%{python_sitelib}/core/emane/rfpipe.py* -%{python_sitelib}/core/emane/tdma.py* -%{python_sitelib}/core/emane/universal.py* -%{python_sitelib}/core/__init__.py* -%{python_sitelib}/core/location.py* -%dir %{python_sitelib}/core/misc -%{python_sitelib}/core/misc/event.py* -%{python_sitelib}/core/misc/__init__.py* -%{python_sitelib}/core/misc/ipaddr.py* -%{python_sitelib}/core/misc/LatLongUTMconversion.py* -%{python_sitelib}/core/misc/quagga.py* -%{python_sitelib}/core/misc/utils.py* -%{python_sitelib}/core/misc/utm.py* -%{python_sitelib}/core/misc/xmldeployment.py* -%{python_sitelib}/core/misc/xmlparser.py* -%{python_sitelib}/core/misc/xmlparser0.py* -%{python_sitelib}/core/misc/xmlparser1.py* -%{python_sitelib}/core/misc/xmlsession.py* -%{python_sitelib}/core/misc/xmlutils.py* -%{python_sitelib}/core/misc/xmlwriter.py* -%{python_sitelib}/core/misc/xmlwriter0.py* -%{python_sitelib}/core/misc/xmlwriter1.py* -%{python_sitelib}/core/mobility.py* -%dir %{python_sitelib}/core/netns -%{python_sitelib}/core/netns/__init__.py* -%{python_sitelib}/core/netns/nodes.py* -%{python_sitelib}/core/netns/vif.py* -%{python_sitelib}/core/netns/vnet.py* -%{python_sitelib}/core/netns/vnodeclient.py* -%{python_sitelib}/core/netns/vnode.py* -%dir %{python_sitelib}/corens3 -%{python_sitelib}/corens3/constants.py* -%{python_sitelib}/corens3/__init__.py* -%{python_sitelib}/corens3/obj.py* -%{python_sitelib}/corens3_python-@COREDPY_VERSION@-py%{python_version}.egg-info -%dir %{python_sitelib}/core/phys -%{python_sitelib}/core/phys/__init__.py* -%{python_sitelib}/core/phys/pnodes.py* -%{python_sitelib}/core_python-@COREDPY_VERSION@-py%{python_version}.egg-info -%dir %{python_sitelib}/core/services -%{python_sitelib}/core/services/bird.py* -%{python_sitelib}/core/services/__init__.py* -%{python_sitelib}/core/services/dockersvc.py* -%{python_sitelib}/core/services/nrl.py* -%{python_sitelib}/core/services/quagga.py* -%{python_sitelib}/core/services/security.py* -%{python_sitelib}/core/services/startup.py* -%{python_sitelib}/core/services/ucarp.py* -%{python_sitelib}/core/services/utility.py* -%{python_sitelib}/core/services/xorp.py* -%{python_sitelib}/core/session.py* -%{_sbindir}/core-cleanup -%{_sbindir}/core-daemon -%{_sbindir}/core-manage -%{_sbindir}/coresendmsg -%{_sbindir}/netns -%{_sbindir}/vcmd -%{_sbindir}/vnoded - -%changelog -* Fri Sep 01 2017 CORE Developers - 5.0 -- Added Ryu SD and Open vSwitch services, code cleanup and refactoring -* Fri Jun 5 2015 CORE Developers - 4.8 -- Support for NRL Network Modeling Framework (NMF) XML representation, bugfixes -* Wed Aug 6 2014 Jeff Ahrenholz - 4.7 -- EMANE 0.9.1, asymmetric links, bugfixes -* Thu Aug 22 2013 Jeff Ahrenholz - 4.6 -- cored now core-daemon, core now core-gui for CORE 4.6 release -* Wed Apr 3 2013 Jeff Ahrenholz - 4.5 -- split into gui and daemon RPMs for CORE 4.5 release -* Tue Sep 4 2012 Jeff Ahrenholz - 4.4 -- update files list for CORE 4.4 release, removed info file -* Tue Feb 7 2012 Jeff Ahrenholz - 4.3 -- update files list for CORE 4.3 release, freshen dependencies -* Tue Aug 16 2011 Jeff Ahrenholz - 4.2 -- update for CORE 4.2 release; use dir variables, more arch independent -* Mon Dec 13 2010 Jeff Ahrenholz - 4.1 -- update for CORE 4.1 release; added calls to ldconfig and removal of pyc files -* Wed Aug 4 2010 Jeff Ahrenholz - 4.0 -- update for CORE 4.0 release for Python and network namespaces -* Thu Sep 10 2009 Jeff Ahrenholz - 3.5 -- update for CORE 3.5 release to include init script -* Fri May 29 2009 Jeff Ahrenholz - 3.4 -- initial spec file for CORE 3.4 release - diff --git a/packaging/rpm/specfiles.sh b/packaging/rpm/specfiles.sh deleted file mode 100755 index 640fb18b..00000000 --- a/packaging/rpm/specfiles.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -OLDDIR=$PWD -cd ../../ - -if [ ! -e Makefile ]; then - echo "Missing file: Makefile" -fi -VER=`grep PACKAGE_VERSION Makefile | awk '{ print $3 }'` -echo "Detected CORE version $VER." - -DESTDIR=/tmp/corerpmspec make install -if [ $? != 0 ]; then - exit 1 -fi -cd /tmp/corerpmspec -find . -type f | sort > newspecfiles.log -# append all .py files with .py* so .pyc files are uninstalled -sed -i 's/\.py$/.py*/g' newspecfiles.log -# directory replacements -sed -i 's/^\.\//\//g' newspecfiles.log -sed -i 's/\/usr\/bin/%{_bindir}/g' newspecfiles.log -sed -i 's/\/usr\/sbin/%{_sbindir}/g' newspecfiles.log -sed -i 's/\/usr\/lib64\/python2.7\/site-packages/%{python_sitearch}/g' newspecfiles.log -sed -i 's/\/usr\/lib\/python2.7\/site-packages/%{python_sitelib}/g' newspecfiles.log -sed -i 's/\/usr\/lib\/python2.7\/dist-packages/%{python_sitelib}/g' newspecfiles.log -sed -i 's/\/usr\/lib\/core/@CORE_LIB_DIR@/g' newspecfiles.log -sed -i 's/\/usr\/share\/applications/%{_datadir}\/applications/g' newspecfiles.log -sed -i 's/\/usr\/share\/pixmaps/%{_datadir}\/pixmaps/g' newspecfiles.log -sed -i 's/\/usr\/share\/core/%{_datadir}\/%{name}/g' newspecfiles.log -sed -i 's/\/etc\/core/%config @CORE_CONF_DIR@/g' newspecfiles.log -sed -i 's/py2.7.egg/py@PYTHON_VERSION@.egg/g' newspecfiles.log -sed -i "s/$VER/@COREDPY_VERSION@/g" newspecfiles.log -sed -i 's/\/usr\/share\/man/%doc %{_mandir}/g' newspecfiles.log -sed -i 's/\.1$/.1.gz/g' newspecfiles.log - -echo . -echo A new filelist is available here: -ls -al /tmp/corerpmspec/newspecfiles.log -echo . -cd $OLDDIR