diff options
| -rw-r--r-- | .cvsignore | 5 | ||||
| -rw-r--r-- | cgit-0.8.1-Makefile-install.patch | 33 | ||||
| -rw-r--r-- | cgit.spec | 15 | ||||
| -rw-r--r-- | sources | 4 |
4 files changed, 12 insertions, 45 deletions
@@ -1,3 +1,2 @@ -*.rpm -*.tar.bz2 -clog +cgit-0.8.2.tar.bz2 +git-1.6.1.1.tar.bz2 diff --git a/cgit-0.8.1-Makefile-install.patch b/cgit-0.8.1-Makefile-install.patch deleted file mode 100644 index 89825e9..0000000 --- a/cgit-0.8.1-Makefile-install.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up cgit-0.8.1/Makefile.install cgit-0.8.1/Makefile ---- cgit-0.8.1/Makefile.install 2008-10-11 14:22:57.000000000 -0400 -+++ cgit-0.8.1/Makefile 2009-01-11 11:56:51.000000000 -0500 -@@ -1,11 +1,13 @@ - CGIT_VERSION = v0.8.1 - CGIT_SCRIPT_NAME = cgit.cgi - CGIT_SCRIPT_PATH = /var/www/htdocs/cgit -+CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) - CGIT_CONFIG = /etc/cgitrc - CACHE_ROOT = /var/cache/cgit - SHA1_HEADER = <openssl/sha.h> - GIT_VER = 1.6.0.2 - GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 -+INSTALL = install - - # - # Let the user override the above settings. -@@ -112,10 +114,11 @@ test: all - $(QUIET_SUBDIR0)tests $(QUIET_SUBDIR1) all - - install: all -- mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) -- install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) -- install cgit.css $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.css -- install cgit.png $(DESTDIR)$(CGIT_SCRIPT_PATH)/cgit.png -+ $(INSTALL) -m0755 -d $(DESTDIR)$(CGIT_SCRIPT_PATH) -+ $(INSTALL) -m0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) -+ $(INSTALL) -m0755 -d $(DESTDIR)$(CGIT_DATA_PATH) -+ $(INSTALL) -m0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css -+ $(INSTALL) -m0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png - - uninstall: - rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) @@ -1,6 +1,6 @@ # Review bug: https://bugzilla.redhat.com/479723 -%define gitver 1.6.0.2 +%define gitver 1.6.1.1 %define cachedir %{_localstatedir}/cache/cgit %define scriptdir %{_localstatedir}/www/cgi-bin %define cgitdata %{_datadir}/cgit @@ -16,20 +16,18 @@ make V=1 %{?_smp_mflags} \\\ CGIT_DATA_PATH=%{cgitdata} Name: cgit -Version: 0.8.1 -Release: 2%{?dist} +Version: 0.8.2 +Release: 1%{?dist} Summary: A fast webinterface for git Group: Development/Tools License: GPLv2 URL: http://hjemli.net/git/cgit/ -Source0: http://hjemli.net/git/cgit/snapshot/cgit-0.8.1.tar.bz2 +Source0: http://hjemli.net/git/cgit/snapshot/%{name}-%{version}.tar.bz2 Source1: http://www.kernel.org/pub/software/scm/git/git-%{gitver}.tar.bz2 Source2: cgitrc Source3: cgit.httpd Source4: README.SELinux -# Applied upstream stable branch (4ac89ec and d529c6f) -Patch0: cgit-0.8.1-Makefile-install.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %if 0%{?fedora} @@ -46,7 +44,6 @@ using a builtin cache to decrease server io-pressure. %prep %setup -q -a 1 -%patch0 -p1 -b .install # setup the git dir rm -rf git @@ -84,6 +81,10 @@ rm -rf %{buildroot} %changelog +* Sun Feb 01 2009 Todd Zullinger <tmz@pobox.com> - 0.8.2-1 +- Update to 0.8.2 +- Drop upstreamed Makefile patch + * Sun Jan 18 2009 Todd Zullinger <tmz@pobox.com> - 0.8.1-2 - Rebuild with new openssl @@ -1,2 +1,2 @@ -654850ded01dd2f6b732aa7c1b0856dc cgit-0.8.1.tar.bz2 -1e4d9bfc1cb0abf165d4de93b5172324 git-1.6.0.2.tar.bz2 +872fafaa1ea6bd9292f312878864b665 cgit-0.8.2.tar.bz2 +d2b6925cb03e1e33911fdf9392946747 git-1.6.1.1.tar.bz2 |