From 20833ea68bdd716eed2d220e1222a1d958ecabb3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 17:54:43 +0000 Subject: [PATCH 1/3] Initialize branch F-9 for firefox-32 --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From a55a33360491bda273833e948cc7d016bbb2dbeb Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 27 Oct 2008 17:33:19 +0000 Subject: [PATCH 2/3] obsolete package --- .cvsignore | 0 Makefile | 21 ----------- dead.package | 1 + firefox-32.desktop | 13 ------- firefox-32.spec | 90 --------------------------------------------- setup-firefox-32.sh | 4 -- sources | 0 7 files changed, 1 insertion(+), 128 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 firefox-32.desktop delete mode 100644 firefox-32.spec delete mode 100755 setup-firefox-32.sh delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/Makefile b/Makefile deleted file mode 100644 index 27d5d37..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: firefox-32 -# $Id$ -NAME := firefox-32 -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..e552077 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Obsolete package diff --git a/firefox-32.desktop b/firefox-32.desktop deleted file mode 100644 index f5f74ab..0000000 --- a/firefox-32.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=Firefox Web Browser (32 bit) -GenericName=Web Browser -Comment=Browse the Web -Exec=firefox-32 %u -Icon=redhat-web-browser.png -Terminal=false -Type=Application -NoDisplay=false -Categories=Network;Application;X-Fedora; -StartupNotify=true diff --git a/firefox-32.spec b/firefox-32.spec deleted file mode 100644 index df2e0c0..0000000 --- a/firefox-32.spec +++ /dev/null @@ -1,90 +0,0 @@ -Name: firefox-32 -Version: 0.0.1 -Release: 5%{?dist} -Summary: Alternate Launcher for 32bit Firefox - -Group: Applications/Internet -License: Public Domain -URL: http://people.redhat.com/wtogami/firefox-32 -# This is a shell script maintained in the package SCM, so there is no upstream. -Source0: setup-firefox-32.sh -Source1: firefox-32.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# This is actually noarch (shell script) , but it only makes sense to install on these archs -ExclusiveArch: x86_64 ppc64 s390x -BuildRequires: desktop-file-utils -# Unfortunately, we cannot have a Requires line that explicitly means /usr/lib/ 32bit firefox. -Requires: firefox - -%description -Alternate Launcher for 32bit Firefox on Multilib Systems -If you have both 32bit and 64bit Firefox installed, the standard -/usr/bin/firefox launcher will run only the 64bit version. This -launcher allows you to choose to run the 32bit browser by running -/usr/bin/firefox-32. Please be sure that all Firefox instances -are closed before running this launcher. - -# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=214100 -# This package exists because a few simple lines of logic were rejected -# from the main Fedora firefox package that would have provided the -# ability to easily choose your runtime arch on a multilib system. -# For the long-term, Fedora hopes to obviate the need to run a 32bit -# browser entirely by getting nspluginwrapper to work fully instead. - -%prep -echo "Nothing to prep!" - -%build -echo "Nothing to build!" - -%install -rm -rf $RPM_BUILD_ROOT -install -D -m 0755 %SOURCE0 $RPM_BUILD_ROOT%{_libdir}/firefox-32/setup-firefox-32.sh -mkdir -p $RPM_BUILD_ROOT%{_bindir} -touch $RPM_BUILD_ROOT%{_bindir}/firefox-32 -chmod 0755 $RPM_BUILD_ROOT%{_bindir}/firefox-32 - -desktop-file-install --vendor="fedora" \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE1} - -%clean -rm -rf $RPM_BUILD_ROOT - -# Upon install, generate /usr/bin/firefox-32 based upon the contents of /usr/bin/firefox -%post -%{_libdir}/firefox-32/setup-firefox-32.sh - -# Whenever firefox is upgraded, regenerate /usr/bin/firefox-32 -%triggerin -- firefox -%{_libdir}/firefox-32/setup-firefox-32.sh - -%files -%defattr(-,root,root,-) -# libdir instead of /usr/share because it is meant to be executable -# only on 64bit multilib systems -%{_libdir}/firefox-32/setup-firefox-32.sh -%dir %{_libdir}/firefox-32/ -%{_datadir}/applications/fedora-firefox-32.desktop -%ghost %{_bindir}/firefox-32 - -%changelog -* Sun Nov 26 2006 Warren Togami - 0.0.1-5 -- remove buildarch: noarch - -* Sun Nov 26 2006 Christopher Stone - 0.0.1-4 -- Add desktop-file-install command to install .desktop entry -- Modify .desktop entry to more closely match firefox -- Add BuildArch: noarch - -* Sun Nov 26 2006 Warren Togami - 0.0.1-3 -- change license to Public Domain -- own firefox-32 directory -- fix .desktop file s/True/true/ - -* Wed Nov 22 2006 Warren Togami - 0.0.1-2 -- use Source instead of Patch for source files (#215256) - -* Sun Nov 12 2006 Warren Togami - 0.0.1-1 -- initial version diff --git a/setup-firefox-32.sh b/setup-firefox-32.sh deleted file mode 100755 index 66644bc..0000000 --- a/setup-firefox-32.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -FIREFOX32=/usr/bin/firefox-32 -cp /usr/bin/firefox $FIREFOX32 -sed -i "s/lib64/lib/g" $FIREFOX32 diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 From 4c3230c87e615c07f2e2fb84d6df395795cdee02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:29:35 +0000 Subject: [PATCH 3/3] dist-git conversion --- branch | 1 - 1 file changed, 1 deletion(-) delete mode 100644 branch diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9