Changeset 2602 for trunk/server/fedora

Timestamp:

Aug 28, 2014, 11:31:15 PM (10 years ago)

Author:

achernya

Message:

Behold the glorious, working logview

Location:

trunk/server/fedora/specs

Files:

• httpd.spec.patch (modified) (5 diffs)
• logview.spec (modified) (4 diffs)

trunk/server/fedora/specs/httpd.spec.patch

@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -65,6 +65,13 @@
+@@ -65,6 +65,14 @@
  # Bug fixes
  Patch55: httpd-2.4.4-malformed-host.patch
@@ -20 +20 @@
 +Patch1004: httpd-fixup-vhost.patch
 +Patch1005: httpd-allow-null-user.patch
++Patch1006: httpd-suexec-journald.patch
 +
  License: ASL 2.0
@@ -48 +49 @@
  
  %description -n mod_ssl
-@@ -190,6 +200,12 @@
+@@ -190,6 +200,13 @@
  %patch55 -p1 -b .malformedhost
  %patch56 -p1 -b .uniqueid
@@ -57 +58 @@
 +%patch1004 -p1 -b .fixup-vhost
 +%patch1005 -p1 -b .allow-null-user
++%patch1006 -p1 -b .journald
 +
  # Patch in the vendor string
@@ -89 +91 @@
  %dir %{_libdir}/httpd
  %dir %{_libdir}/httpd/modules
-@@ -1014,3 +1033,8 @@
- * Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
- - update to 2.2.15 (#572404, #579311)
- 
-+Patch1001: httpd-suexec-scripts.patch
-+Patch1002: httpd-mod_status-security.patch
-+Patch1003: httpd-304s.patch
-+Patch1004: httpd-fixup-vhost.patch
-+Patch1005: httpd-allow-null-user.patch

trunk/server/fedora/specs/logview.spec

@@ -2 +2 @@
 Group: Applications/System
 Name: logview
-Version: 0.%{scriptsversion}
+Version: 1.%{scriptsversion}
 Release: 0
 Vendor: The scripts.mit.edu Team (scripts@mit.edu)
@@ -9 +9 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
+BuildArch: noarch
+
 %define debug_package %{nil}
 
 %description 
-
 scripts.mit.edu logview program
 See http://scripts.mit.edu/wiki for more information.
@@ -20 +21 @@
 
 %build
-./configure
-make
 
 %install
 [ $RPM_BUILD_ROOT != / ] && rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT prefix=/usr/local
+mkdir -p %{buildroot}/%{_bindir}/
+cp logview %{buildroot}/%{_bindir}/logview
 
 %clean
@@ -40 +40 @@
 
 %files
-%defattr(0755, root, root)
-/usr/local/bin/logview.pl
-%defattr(2755, root, logview)
-/usr/local/bin/logview
+%{_bindir}/logview
 
 %changelog
+* Fri Aug 29 2014 Alexander Chernyakhovsky <achernya@mit.eduu> - 1.2601-0
+- logview is now journalctl
+
 * Wed Dec 31 2008  Quentin Smith <quentin@mit.edu>
 - ignore preexisting user