diff --git a/.tuna.metadata b/.tuna.metadata new file mode 100644 index 0000000..752f807 --- /dev/null +++ b/.tuna.metadata @@ -0,0 +1 @@ +8a4da0364fd1bb3a2b710747a4154a0ea12c4891 SOURCES/tuna-0.11.1.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/CLI-fix-ps_show_thread-call-with-bad-args-count.patch b/SOURCES/CLI-fix-ps_show_thread-call-with-bad-args-count.patch new file mode 100644 index 0000000..10d0081 --- /dev/null +++ b/SOURCES/CLI-fix-ps_show_thread-call-with-bad-args-count.patch @@ -0,0 +1,29 @@ +From aac51fce90d9007b4ff9c9b5bb3c3969cdb2b01b Mon Sep 17 00:00:00 2001 +From: Petr Oros +Date: Thu, 15 Aug 2013 11:15:45 +0200 +Subject: [PATCH 3/4] CLI: fix ps_show_thread call with bad args count + +Signed-off-by: Petr Oros +(cherry picked from commit a97f70eb407f3ec2972740ca5ab976f5f06ce0bb) + +Signed-off-by: John Kacur +--- + tuna-cmd.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tuna-cmd.py b/tuna-cmd.py +index 64e3ad1..5dcc181 100755 +--- a/tuna-cmd.py ++++ b/tuna-cmd.py +@@ -227,7 +227,7 @@ def ps_show_thread(pid, affect_children, ps, + for tid in ps[pid]["threads"].keys(): + ps_show_thread(tid, False, ps[pid]["threads"], + has_ctxt_switch_info, +- sock_inodes, sock_inode_re) ++ sock_inodes, sock_inode_re, cgroups) + + + def ps_show(ps, affect_children, thread_list, cpu_list, +-- +1.8.1.4 + diff --git a/SOURCES/git-housekeeping-Add-the-.gitattributes-file.patch b/SOURCES/git-housekeeping-Add-the-.gitattributes-file.patch new file mode 100644 index 0000000..92e639d --- /dev/null +++ b/SOURCES/git-housekeeping-Add-the-.gitattributes-file.patch @@ -0,0 +1,26 @@ +From 79f3e0b116dcb1bc0c1d10b370275e14733bcd47 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Fri, 17 May 2013 14:24:47 +0200 +Subject: [PATCH 2/4] git-housekeeping: Add the .gitattributes file + +By adding the .gitattributes file, git-archive can be informed not to +include files such as .gitignore and ironically .gitattributes +when creating an archive. + +Signed-off-by: John Kacur +--- + .gitattributes | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 .gitattributes + +diff --git a/.gitattributes b/.gitattributes +new file mode 100644 +index 0000000..5966153 +--- /dev/null ++++ b/.gitattributes +@@ -0,0 +1,2 @@ ++.gitattributes export-ignore ++.gitignore export-ignore +-- +1.8.1.4 + diff --git a/SOURCES/spec-Mark-configuration-files-with-config.patch b/SOURCES/spec-Mark-configuration-files-with-config.patch new file mode 100644 index 0000000..60d703e --- /dev/null +++ b/SOURCES/spec-Mark-configuration-files-with-config.patch @@ -0,0 +1,32 @@ +From 8ead51bb37c1d95bdba7f224288255de95a05034 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Mon, 19 Aug 2013 22:28:01 +0200 +Subject: [PATCH 1/4] spec: Mark configuration files with %config + +Explicitly declaring configuration files as such, prevents rpmlint +from falsely complaining that non-configuration files are being installed +in /etc + +Signed-off-by: John Kacur +--- + rpm/SPECS/tuna.spec | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpm/SPECS/tuna.spec b/rpm/SPECS/tuna.spec +index 9393df6..4dd26f8 100644 +--- a/rpm/SPECS/tuna.spec ++++ b/rpm/SPECS/tuna.spec +@@ -86,8 +86,8 @@ rm -rf %{buildroot} + %{_datadir}/tuna/ + %{python_sitelib}/tuna/ + %{_mandir}/man8/tuna.8* +-%{_sysconfdir}/tuna.conf +-%{_sysconfdir}/tuna/* ++%config(noreplace) %{_sysconfdir}/tuna.conf ++%config %{_sysconfdir}/tuna/example.conf + %{_datadir}/polkit-1/actions/org.tuna.policy + + %files -n oscilloscope +-- +1.8.1.4 + diff --git a/SOURCES/spec-Show-where-the-original-source-comes-from-in-co.patch b/SOURCES/spec-Show-where-the-original-source-comes-from-in-co.patch new file mode 100644 index 0000000..8e69c66 --- /dev/null +++ b/SOURCES/spec-Show-where-the-original-source-comes-from-in-co.patch @@ -0,0 +1,25 @@ +From e9b3dec6a7396f6da2b21ded1bb97b00b6505077 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Thu, 22 Aug 2013 15:51:50 +0200 +Subject: [PATCH 4/4] spec: Show where the original source comes from in + comments Signed-off-by: John Kacur + +--- + rpm/SPECS/tuna.spec | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/rpm/SPECS/tuna.spec b/rpm/SPECS/tuna.spec +index 4dd26f8..09d571d 100644 +--- a/rpm/SPECS/tuna.spec ++++ b/rpm/SPECS/tuna.spec +@@ -9,6 +9,7 @@ Summary: Application tuning GUI & command line utility + Group: Applications/System + Source: http://userweb.kernel.org/~acme/tuna/%{name}-%{version}.tar.bz2 + URL: http://userweb.kernel.org/~acme/tuna/ ++# Real source is now at git://git.kernel.org/pub/scm/utils/tuna/tuna + BuildArch: noarch + BuildRequires: python-devel, gettext + Requires: python-ethtool +-- +1.8.1.4 + diff --git a/SPECS/tuna.spec b/SPECS/tuna.spec new file mode 100644 index 0000000..a24f175 --- /dev/null +++ b/SPECS/tuna.spec @@ -0,0 +1,155 @@ +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_ver: %define python_ver %(%{__python} -c "import sys ; print sys.version[:3]")} + +Name: tuna +Version: 0.11.1 +Release: 4%{?dist} +License: GPLv2 +Summary: Application tuning GUI & command line utility +Group: Applications/System +Source: http://userweb.kernel.org/~acme/tuna/%{name}-%{version}.tar.bz2 +Patch1: spec-Mark-configuration-files-with-config.patch +Patch2: git-housekeeping-Add-the-.gitattributes-file.patch +Patch3: CLI-fix-ps_show_thread-call-with-bad-args-count.patch +Patch4: spec-Show-where-the-original-source-comes-from-in-co.patch +URL: http://userweb.kernel.org/~acme/tuna/ +# Real source is now at git://git.kernel.org/pub/scm/utils/tuna/tuna +BuildArch: noarch +BuildRequires: python-devel, gettext +Requires: python-ethtool +Requires: python-linux-procfs >= 0.4.5 +Requires: python-schedutils >= 0.2 +# This really should be a Suggests... +# Requires: python-inet_diag +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +%description +Provides interface for changing scheduler and IRQ tunables, at whole CPU and at +per thread/IRQ level. Allows isolating CPUs for use by a specific application +and moving threads and interrupts to a CPU by just dragging and dropping them. +Operations can be done on CPU sockets, understanding CPU topology. + +Can be used as a command line utility without requiring the GUI libraries to be +installed. + +%package -n oscilloscope +Summary: Generic graphical signal plotting tool +Group: Applications/System +Requires: python-matplotlib +Requires: numpy +Requires: pygtk2 +Requires: tuna = %{version}-%{release} + +%description -n oscilloscope +Plots stream of values read from standard input on the screen together with +statistics and a histogram. + +Allows to instantly see how a signal generator, such as cyclictest, signaltest +or even ping, reacts when, for instance, its scheduling policy or real time +priority is changed, be it using tuna or plain chrt & taskset. + +%prep +%setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + +%build +%{__python} setup.py build + +%install +rm -rf %{buildroot} +%{__python} setup.py install --skip-build --root %{buildroot} +mkdir -p %{buildroot}/%{_sysconfdir}/tuna/ +mkdir -p %{buildroot}/{%{_bindir},%{_datadir}/tuna/help/kthreads,%{_mandir}/man8} +mkdir -p %{buildroot}/%{_datadir}/polkit-1/actions/ +install -p -m644 tuna/tuna_gui.glade %{buildroot}/%{_datadir}/tuna/ +install -p -m755 tuna-cmd.py %{buildroot}/%{_bindir}/tuna +install -p -m755 oscilloscope-cmd.py %{buildroot}/%{_bindir}/oscilloscope +install -p -m644 help/kthreads/* %{buildroot}/%{_datadir}/tuna/help/kthreads/ +install -p -m644 docs/tuna.8 %{buildroot}/%{_mandir}/man8/ +install -p -m644 etc/tuna/example.conf %{buildroot}/%{_sysconfdir}/tuna/ +install -p -m644 etc/tuna.conf %{buildroot}/%{_sysconfdir}/ +install -p -m644 org.tuna.policy %{buildroot}/%{_datadir}/polkit-1/actions/ + +# l10n-ed message catalogues +for lng in `cat po/LINGUAS`; do + po=po/"$lng.po" + mkdir -p %{buildroot}/%{_datadir}/locale/${lng}/LC_MESSAGES + msgfmt $po -o %{buildroot}/%{_datadir}/locale/${lng}/LC_MESSAGES/%{name}.mo +done + +%find_lang %name + +%clean +rm -rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc ChangeLog +%if "%{python_ver}" >= "2.5" +%{python_sitelib}/*.egg-info +%endif +%{_bindir}/tuna +%{_datadir}/tuna/ +%{python_sitelib}/tuna/ +%{_mandir}/man8/tuna.8* +%config(noreplace) %{_sysconfdir}/tuna.conf +%config %{_sysconfdir}/tuna/example.conf +%{_datadir}/polkit-1/actions/org.tuna.policy + +%files -n oscilloscope +%defattr(-,root,root,-) +%{_bindir}/oscilloscope +%doc docs/oscilloscope+tuna.html +%doc docs/oscilloscope+tuna.pdf + +%changelog +* Thu Nov 07 2013 John Kacur - 0.11.1-4 +- tuna: Do polkit auth for GUI BZ:919212,974027 (996885) +- tuna: Auto Correction for config file errors (1015062) +- Rebased to 0.11.1 upstream +Resolves: rhbz#996885 +Resolves: rhbz#1015062 + +* Thu Aug 22 2013 John Kacur - 0.11-3 +- spec: Mark configuration files with %config (998984) +- spec: Document the real location of the source in a comment (998987) +- CLI: fix ps_show_thread call with bad args count (1000025) + +* Tue Jun 11 2013 Jiri Kastner - 0.11-2 +- changed dependencies from python-numeric to numpy +- merged spec changes from upstream + +* Thu Jun 6 2013 Jiri Kastner - 0.11-1 +- New upstream release + +* Fri Feb 15 2013 Fedora Release Engineering - 0.9.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 0.9.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.9.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Fedora Release Engineering - 0.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Aug 01 2010 Orcan Ogetbil - 0.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Thu Sep 03 2009 Arnaldo Carvalho de Melo - 0.9.1-1 +- New upstream release + +* Wed Aug 26 2009 Arnaldo Carvalho de Melo - 0.9-3 +- Rewrite the oscilloscope package summary +- Remove the shebang in tuna/oscilloscope.py + +* Mon Aug 17 2009 Arnaldo Carvalho de Melo - 0.9-2 +- Use install -p +- Add BuildRequires for gettext + +* Fri Jul 10 2009 Arnaldo Carvalho de Melo - 0.9-1 +- Fedora package reviewing changes: introduce ChangeLog file