Mailinglist Archive: opensuse-commit (1426 mails)
| < Previous | Next > |
commit traffic-vis
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 22 Mar 2007 21:08:39 +0100
- Message-id: <20070322200839.C74CD678180@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package traffic-vis
checked in at Thu Mar 22 21:08:39 CET 2007.
--------
--- traffic-vis/traffic-vis.changes 2006-01-25 21:42:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/traffic-vis/traffic-vis.changes 2007-03-19 18:11:46.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Mar 15 19:13:26 CET 2007 - mkudlvasr@xxxxxxx
+
+- edited makefile to install as current user (not root)
+
+-------------------------------------------------------------------
New:
----
traffic-vis-0.35-make-install-fix.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ traffic-vis.spec ++++++
--- /var/tmp/diff_new_pack.F28993/_old 2007-03-22 21:08:19.000000000 +0100
+++ /var/tmp/diff_new_pack.F28993/_new 2007-03-22 21:08:19.000000000 +0100
@@ -1,23 +1,24 @@
#
# spec file for package traffic-vis (Version 0.35)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# norootforbuild
Name: traffic-vis
BuildRequires: gtk1-compat-devel libpcap
-License: GPL
+License: GNU General Public License (GPL)
Group: Productivity/Networking/Diagnostic
Provides: traf_vis
Requires: netpbm
Autoreqprov: on
Version: 0.35
-Release: 142
+Release: 190
URL: http://www.mindrot.org/traffic-vis.html
Summary: Network Traffic Analysis Suite
Source: %{name}-%{version}.tar.bz2
@@ -25,6 +26,7 @@
Patch2: %{name}-%{version}-multiline-fix.diff
Patch3: %{name}-%{version}-warnings-fix.diff
Patch4: %{name}-%{version}-libpcap.diff
+Patch5: %{name}-%{version}-make-install-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: traf_vis
@@ -46,12 +48,14 @@
%patch2
%patch3
%patch4
+%patch5
%build
make SBINDIR=/usr/sbin MANDIR=/usr/share/man
%install
rm -rf $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT
install -d -m 755 ${RPM_BUILD_ROOT}/usr/sbin
install -d -m 755 ${RPM_BUILD_ROOT}/usr/share/man/man8
make install SBINDIR=${RPM_BUILD_ROOT}/usr/sbin MANDIR=${RPM_BUILD_ROOT}/usr/share/man
@@ -60,11 +64,14 @@
rm -rf $RPM_BUILD_ROOT
%files
+%defattr(644, root, root, 755)
%doc BUGS CHANGELOG README TODO
-/usr/sbin/*
%doc /usr/share/man/*/*
+%attr(750, root, root) /usr/sbin/*
-%changelog -n traffic-vis
+%changelog
+* Thu Mar 15 2007 - mkudlvasr@xxxxxxx
+- edited makefile to install as current user (not root)
* Wed Jan 25 2006 - mls@xxxxxxx
- converted neededforbuild to BuildRequires
* Wed Oct 12 2005 - sbrabec@xxxxxxx
++++++ traffic-vis-0.35-make-install-fix.diff ++++++
--- Makefile
+++ Makefile
@@ -40,7 +40,7 @@
do \
make -C $$x SBINDIR="$(SBINDIR)" MANDIR="$(MANDIR)" install || exit 1; \
done
- install -m 644 -o root -g root traffic-vis.8 $(MANDIR)/man8/
+ install -m 644 traffic-vis.8 $(MANDIR)/man8/
clean:
rm -f *.o core ~* *.a *.ps *.txt *.html test test.o *.tv
--- collector/Makefile
+++ collector/Makefile
@@ -10,8 +10,8 @@
$(CC) -o $@ traffic-collector.o $(OBJS) $(LIBS)
install:
- install -m 750 -o root -g root traffic-collector $(SBINDIR)
- install -m 644 -o root -g root traffic-collector.8 $(MANDIR)/man8/
+ install -m 750 traffic-collector $(SBINDIR)
+ install -m 644 traffic-collector.8 $(MANDIR)/man8/
clean:
-rm -f $(TARGETS) *.o core *.ps
--- frontends/Makefile
+++ frontends/Makefile
@@ -16,14 +16,14 @@
$(CC) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS)
install:
- install -m 755 -o root -g root traffic-tops $(SBINDIR)
- install -m 644 -o root -g root traffic-tops.8 $(MANDIR)/man8/
- install -m 755 -o root -g root traffic-totext $(SBINDIR)
- install -m 644 -o root -g root traffic-totext.8 $(MANDIR)/man8/
- install -m 755 -o root -g root traffic-tohtml $(SBINDIR)
- install -m 644 -o root -g root traffic-tohtml.8 $(MANDIR)/man8/
- install -m 755 -o root -g root traffic-togif $(SBINDIR)
- install -m 644 -o root -g root traffic-togif.8 $(MANDIR)/man8/
+ install -m 755 traffic-tops $(SBINDIR)
+ install -m 644 traffic-tops.8 $(MANDIR)/man8/
+ install -m 755 traffic-totext $(SBINDIR)
+ install -m 644 traffic-totext.8 $(MANDIR)/man8/
+ install -m 755 traffic-tohtml $(SBINDIR)
+ install -m 644 traffic-tohtml.8 $(MANDIR)/man8/
+ install -m 755 traffic-togif $(SBINDIR)
+ install -m 644 traffic-togif.8 $(MANDIR)/man8/
clean:
-rm -f $(TARGETS) *.o core *.ps
--- sort/Makefile
+++ sort/Makefile
@@ -10,8 +10,8 @@
$(CC) $(LFLAGS) -o $@ traffic-sort.o $(LIBS)
install:
- install -m 755 -o root -g root traffic-sort $(SBINDIR)
- install -m 644 -o root -g root traffic-sort.8 $(MANDIR)/man8/
+ install -m 755 traffic-sort $(SBINDIR)
+ install -m 644 traffic-sort.8 $(MANDIR)/man8/
clean:
-rm -f $(TARGETS) *.o core *.ps
--- utils/Makefile
+++ utils/Makefile
@@ -13,10 +13,10 @@
$(CC) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS)
install:
- install -m 755 -o root -g root traffic-resolve $(SBINDIR)
- install -m 644 -o root -g root traffic-resolve.8 $(MANDIR)/man8/
- install -m 755 -o root -g root traffic-exclude $(SBINDIR)
- install -m 644 -o root -g root traffic-exclude.8 $(MANDIR)/man8/
+ install -m 755 traffic-resolve $(SBINDIR)
+ install -m 644 traffic-resolve.8 $(MANDIR)/man8/
+ install -m 755 traffic-exclude $(SBINDIR)
+ install -m 644 traffic-exclude.8 $(MANDIR)/man8/
clean:
-rm -f $(TARGETS) *.o core *.ps
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |