From 3dd3002e289f4964097b186493db117b96135d29 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:56:40 +0000 Subject: [PATCH 1/4] Initialize branch F-13 for babl --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From d06ca402f365e8d04af9582ea1185103ecbda393 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 14 Jun 2010 12:52:39 +0000 Subject: [PATCH 2/4] split off devel-docs subpackage to make package multi-lib compliant (#477807) let devel package require correct arch of base package --- babl.spec | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/babl.spec b/babl.spec index deb0208..68f8173 100644 --- a/babl.spec +++ b/babl.spec @@ -1,7 +1,7 @@ Summary: A dynamic, any to any, pixel format conversion library Name: babl Version: 0.1.2 -Release: 1%{?dist} +Release: 2%{?dist} # The gggl codes contained in this package are under the GPL, with exceptions allowing their use under libraries covered under the LGPL License: LGPLv3+ and GPLv3+ Group: System Environment/Libraries @@ -10,6 +10,8 @@ Source0: ftp://ftp.gtk.org/pub/babl/0.1/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: librsvg2 w3m +%global develdocdir %{_docdir}/%{name}-devel-%{version}/html + %description Babl is a dynamic, any to any, pixel format conversion library. It provides conversions between the myriad of buffer types images can be @@ -19,13 +21,28 @@ facilitates creation of new and uncommon ones. %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +# Split off devel docs from 0.1.2-2 on +Obsoletes: %{name}-devel < 0.1.2-2%{?dist} +Conflicts: %{name}-devel < 0.1.2-2%{?dist} %description devel This package contains the libraries and header files needed for developing with %{name}. +%package devel-docs +Summary: Documentation for developing programs that will use %{name} +Group: Documentation +BuildArch: noarch +Requires: %{name}-devel = %{version}-%{release} +# Split off devel docs from 0.1.2-2 on +Obsoletes: %{name}-devel < 0.1.2-2%{?dist} +Conflicts: %{name}-devel < 0.1.2-2%{?dist} + +%description devel-docs +This package contains documentation needed for developing with %{name}. + %prep %setup -q @@ -33,20 +50,17 @@ developing with %{name}. %configure --disable-static make V=1 %{?_smp_mflags} - + %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install INSTALL='install -p' -mkdir -p babl_docs babl_docs/html -cp -pr docs/graphics docs/*.html docs/babl.css babl_docs/html -rm -rf babl_docs/html/graphics/Makefile* +mkdir -p "%{buildroot}/%{develdocdir}" +cp -pr docs/graphics docs/*.html docs/babl.css "%{buildroot}/%{develdocdir}" +rm -rf "%{buildroot}/%{develdocdir}"/graphics/Makefile* find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' -# fix timestamps for multilib -touch -m --reference=docs/Makefile.am babl_docs/html{,/graphics}/* - %check make check @@ -65,12 +79,19 @@ rm -rf %{buildroot} %files devel %defattr(-, root, root, -) -%doc babl_docs/html %{_includedir}/babl-0.1/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc +%files devel-docs +%defattr(-, root, root, -) +%doc %{develdocdir} + %changelog +* Mon Jun 14 2010 Nils Philippsen - 0.1.2-2 +- split off devel-docs subpackage to make package multi-lib compliant (#477807) +- let devel package require correct arch of base package + * Thu Jan 21 2010 Deji Akingunola - 0.1.2-1 - Update to 0.1.2 From a9c25ab095d7a1598d91d28d6c3f4359bbb3bbb4 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 24 Jun 2010 09:14:02 +0000 Subject: [PATCH 3/4] use PIC/PIE because babl is likely to deal with data coming from untrusted sources build with -fno-strict-aliasing --- babl.spec | 13 ++++++++++++- import.log | 1 + 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 import.log diff --git a/babl.spec b/babl.spec index 68f8173..a477206 100644 --- a/babl.spec +++ b/babl.spec @@ -1,7 +1,7 @@ Summary: A dynamic, any to any, pixel format conversion library Name: babl Version: 0.1.2 -Release: 2%{?dist} +Release: 4%{?dist} # The gggl codes contained in this package are under the GPL, with exceptions allowing their use under libraries covered under the LGPL License: LGPLv3+ and GPLv3+ Group: System Environment/Libraries @@ -47,6 +47,10 @@ This package contains documentation needed for developing with %{name}. %setup -q %build +# use PIC/PIE because babl is likely to deal with data coming from untrusted +# sources +CFLAGS="-fPIC %optflags -fno-strict-aliasing" +LDFLAGS="-pie" %configure --disable-static make V=1 %{?_smp_mflags} @@ -88,6 +92,13 @@ rm -rf %{buildroot} %doc %{develdocdir} %changelog +* Wed Jun 23 2010 Nils Philippsen - 0.1.2-4 +- use PIC/PIE because babl is likely to deal with data coming from untrusted + sources + +* Wed Jun 23 2010 Nils Philippsen - 0.1.2-3 +- build with -fno-strict-aliasing + * Mon Jun 14 2010 Nils Philippsen - 0.1.2-2 - split off devel-docs subpackage to make package multi-lib compliant (#477807) - let devel package require correct arch of base package diff --git a/import.log b/import.log new file mode 100644 index 0000000..5959eca --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +babl-0_1_2-4_fc14:F-13:babl-0.1.2-4.fc14.src.rpm:1277370770 From 663cfd6649dda49274ae433997a62a9d618114b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 10:44:17 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8c9df25..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: babl -# $Id: Makefile,v 1.1 2007/10/23 00:30:38 tibbs Exp $ -NAME := babl -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 $$d/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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 diff --git a/import.log b/import.log deleted file mode 100644 index 5959eca..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -babl-0_1_2-4_fc14:F-13:babl-0.1.2-4.fc14.src.rpm:1277370770