From f364ab4aec867fd49f76f6126e55e61709b4bb26 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Wed, 5 Aug 2009 04:02:36 +0000 Subject: [PATCH 1/4] Initial commit of znc-extra-0.074 --- .cvsignore | 1 + import.log | 1 + sources | 1 + znc-extra.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 import.log 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/import.log b/import.log new file mode 100644 index 0000000..f67bd35 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +znc-extra-0_074-1_fc11:HEAD:znc-extra-0.074-1.fc11.src.rpm:1249444949 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 88142d738406975f372520dafa62af29eebbd401 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 8 Aug 2009 05:28:32 +0000 Subject: [PATCH 2/4] Update to 0.075-1.20090807git --- .cvsignore | 2 +- sources | 2 +- znc-extra.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f28a4f6..a258073 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -znc-extra-0.074.tar.gz +znc-extra-0.075.20090807git.tar.bz2 diff --git a/sources b/sources index 7c28d56..26f7482 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34c0f43318c8c4a2cfb3a962e1740255 znc-extra-0.074.tar.gz +536a8414419b698274296a6e87d797e0 znc-extra-0.075.20090807git.tar.bz2 diff --git a/znc-extra.spec b/znc-extra.spec index ac12ced..b4377ce 100644 --- a/znc-extra.spec +++ b/znc-extra.spec @@ -1,11 +1,12 @@ Summary: Extra modules for ZNC IRC bouncer Name: znc-extra -Version: 0.074 +Version: 0.075 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 +# git snapshot 20090807 from git://git.znc.in/?p=psychon/znc-extra.git +Source0: znc-extra-0.075.20090807git.tar.bz2 Requires: znc = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: znc-devel = %{version} @@ -41,6 +42,9 @@ Extra modules for ZNC IRC bouncer %{_datadir}/znc/webadmin/skins/* %changelog +* Sat Aug 8 2009 Nick Bebout - 0.075-1.20090807git +- Update to git snapshot 20090807 + * Tue Aug 4 2009 Nick Bebout - 0.074-1 - Update to 0.074 of znc-extra - Restore normal Requires and BuildRequires From e7418230ae22a5c736521676e3ca89bb370e8ea0 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Sat, 8 Aug 2009 05:29:10 +0000 Subject: [PATCH 3/4] Fix SPEC file --- znc-extra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/znc-extra.spec b/znc-extra.spec index b4377ce..685b6d4 100644 --- a/znc-extra.spec +++ b/znc-extra.spec @@ -1,7 +1,7 @@ Summary: Extra modules for ZNC IRC bouncer Name: znc-extra Version: 0.075 -Release: 1%{?dist} +Release: 1.20090807git%{?dist} License: GPLv2 with exceptions Group: System Environment/Daemons URL: http://znc.sf.net/ From e2d786e35448dce2783eac51227822f81b0c0c51 Mon Sep 17 00:00:00 2001 From: Nick Bebout Date: Fri, 21 Aug 2009 06:02:03 +0000 Subject: [PATCH 4/4] znc-extra is now a subpackage of znc --- .cvsignore | 1 - Makefile | 21 ----------------- dead.package | 1 + import.log | 1 - sources | 1 - znc-extra.spec | 61 -------------------------------------------------- 6 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 .cvsignore delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 import.log delete mode 100644 sources delete mode 100644 znc-extra.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index a258073..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -znc-extra-0.075.20090807git.tar.bz2 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/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/import.log b/import.log deleted file mode 100644 index f67bd35..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -znc-extra-0_074-1_fc11:HEAD:znc-extra-0.074-1.fc11.src.rpm:1249444949 diff --git a/sources b/sources deleted file mode 100644 index 26f7482..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -536a8414419b698274296a6e87d797e0 znc-extra-0.075.20090807git.tar.bz2 diff --git a/znc-extra.spec b/znc-extra.spec deleted file mode 100644 index 685b6d4..0000000 --- a/znc-extra.spec +++ /dev/null @@ -1,61 +0,0 @@ -Summary: Extra modules for ZNC IRC bouncer -Name: znc-extra -Version: 0.075 -Release: 1.20090807git%{?dist} -License: GPLv2 with exceptions -Group: System Environment/Daemons -URL: http://znc.sf.net/ -# git snapshot 20090807 from git://git.znc.in/?p=psychon/znc-extra.git -Source0: znc-extra-0.075.20090807git.tar.bz2 -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 -* Sat Aug 8 2009 Nick Bebout - 0.075-1.20090807git -- Update to git snapshot 20090807 - -* 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