From 3583b99c8919d5d682e02e309bb97f294dcce545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Tue, 4 Aug 2009 20:27:02 +0000 Subject: [PATCH 1/3] Initialize branch F-11 for znc-extra --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From f86bb23034f5d270d1a7401f5b065fa9c44ddd6d Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 5 Aug 2009 04:09:45 +0000 Subject: [PATCH 2/3] F-11 commit for znc-extra-0.074 --- .cvsignore | 1 + sources | 1 + znc-extra.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) create mode 100644 znc-extra.spec diff --git a/.cvsignore b/.cvsignore index e69de29..f28a4f6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +znc-extra-0.074.tar.gz diff --git a/sources b/sources index e69de29..7c28d56 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +34c0f43318c8c4a2cfb3a962e1740255 znc-extra-0.074.tar.gz diff --git a/znc-extra.spec b/znc-extra.spec new file mode 100644 index 0000000..ac12ced --- /dev/null +++ b/znc-extra.spec @@ -0,0 +1,57 @@ +Summary: Extra modules for ZNC IRC bouncer +Name: znc-extra +Version: 0.074 +Release: 1%{?dist} +License: GPLv2 with exceptions +Group: System Environment/Daemons +URL: http://znc.sf.net/ +Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-extra-%{version}.tar.gz +Requires: znc = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: znc-devel = %{version} +BuildRequires: openssl-devel >= 0.9.8 + +# The following line is necessary because this module +# is needed for Fedora, but not for EPEL. +%{?fedora:BuildRequires: perl-ExtUtils-Embed} + +%description +Extra modules for ZNC IRC bouncer + +%prep +%setup -q + +%build +%configure +%__make %{?_smp_mflags} + +%install +%__rm -Rf "%{buildroot}" +%__make install DESTDIR="%{buildroot}" +#mkdir "%{buildroot}/%{_datadir}/znc" +#%__mv "%{buildroot}/%{_datadir}/webadmin" "%{buildroot}/%{_datadir}/znc/" + +%clean +%__rm -Rf "%{buildroot}" + +%files +%defattr(-,root,root) +%doc AUTHORS LICENSE LICENSE.OpenSSL +%{_libdir}/znc/* +%{_datadir}/znc/webadmin/skins/* + +%changelog +* Tue Aug 4 2009 Nick Bebout - 0.074-1 +- Update to 0.074 of znc-extra +- Restore normal Requires and BuildRequires + +* Sun Aug 2 2009 Nick Bebout - 0.072-3 +- Re-add openssl-devel BuildRequires + +* Sun Aug 2 2009 Nick Bebout - 0.072-2 +- Do not attempt to own directories owned by znc package +- Change version to match znc-extra upstream +- Explicitly require znc = 0.074 + +* Wed Jul 22 2009 Nick Bebout - 0.072-1 +- Initial Fedora package based on 0.072 of upstream From 43046ed8f0bf521cc460dfa89530618fd827cd51 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 21 Aug 2009 06:02:02 +0000 Subject: [PATCH 3/3] znc-extra is now a subpackage of znc --- .cvsignore | 1 - Makefile | 21 ------------------- branch | 1 - dead.package | 1 + sources | 1 - znc-extra.spec | 57 -------------------------------------------------- 6 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile delete mode 100644 branch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 znc-extra.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f28a4f6..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -znc-extra-0.074.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 9d5a6eb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: znc-extra -# $Id$ -NAME := znc-extra -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/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..ee19beb --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +znc-extra is now a subpackage of znc diff --git a/sources b/sources deleted file mode 100644 index 7c28d56..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -34c0f43318c8c4a2cfb3a962e1740255 znc-extra-0.074.tar.gz diff --git a/znc-extra.spec b/znc-extra.spec deleted file mode 100644 index ac12ced..0000000 --- a/znc-extra.spec +++ /dev/null @@ -1,57 +0,0 @@ -Summary: Extra modules for ZNC IRC bouncer -Name: znc-extra -Version: 0.074 -Release: 1%{?dist} -License: GPLv2 with exceptions -Group: System Environment/Daemons -URL: http://znc.sf.net/ -Source0: http://downloads.sourceforge.net/sourceforge/znc/znc-extra-%{version}.tar.gz -Requires: znc = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: znc-devel = %{version} -BuildRequires: openssl-devel >= 0.9.8 - -# The following line is necessary because this module -# is needed for Fedora, but not for EPEL. -%{?fedora:BuildRequires: perl-ExtUtils-Embed} - -%description -Extra modules for ZNC IRC bouncer - -%prep -%setup -q - -%build -%configure -%__make %{?_smp_mflags} - -%install -%__rm -Rf "%{buildroot}" -%__make install DESTDIR="%{buildroot}" -#mkdir "%{buildroot}/%{_datadir}/znc" -#%__mv "%{buildroot}/%{_datadir}/webadmin" "%{buildroot}/%{_datadir}/znc/" - -%clean -%__rm -Rf "%{buildroot}" - -%files -%defattr(-,root,root) -%doc AUTHORS LICENSE LICENSE.OpenSSL -%{_libdir}/znc/* -%{_datadir}/znc/webadmin/skins/* - -%changelog -* Tue Aug 4 2009 Nick Bebout - 0.074-1 -- Update to 0.074 of znc-extra -- Restore normal Requires and BuildRequires - -* Sun Aug 2 2009 Nick Bebout - 0.072-3 -- Re-add openssl-devel BuildRequires - -* Sun Aug 2 2009 Nick Bebout - 0.072-2 -- Do not attempt to own directories owned by znc package -- Change version to match znc-extra upstream -- Explicitly require znc = 0.074 - -* Wed Jul 22 2009 Nick Bebout - 0.072-1 -- Initial Fedora package based on 0.072 of upstream