rpms/libtunepimp-extras-freeworld/F-16 libtunepimp-0.5.3-curl.patch, NONE, 1.1 libtunepimp-extras-freeworld.spec, 1.8, 1.9
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/libtunepimp-extras-freeworld/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8568
Modified Files:
libtunepimp-extras-freeworld.spec
Added Files:
libtunepimp-0.5.3-curl.patch
Log Message:
* Wed May 02 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-11
- fix for newer curl
libtunepimp-0.5.3-curl.patch:
protocol.cpp | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE libtunepimp-0.5.3-curl.patch ---
diff -up libtunepimp-0.5.3/lib/protocol.cpp.me libtunepimp-0.5.3/lib/protocol.cpp
--- libtunepimp-0.5.3/lib/protocol.cpp.me 2011-12-02 15:33:29.000000000 +0100
+++ libtunepimp-0.5.3/lib/protocol.cpp 2011-12-02 15:33:54.000000000 +0100
@@ -13,7 +13,6 @@
#include <map>
#include <expat.h>
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
using namespace std;
Index: libtunepimp-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/libtunepimp-extras-freeworld/F-16/libtunepimp-extras-freeworld.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libtunepimp-extras-freeworld.spec 7 Apr 2009 19:29:07 -0000 1.8
+++ libtunepimp-extras-freeworld.spec 2 May 2012 17:45:24 -0000 1.9
@@ -2,7 +2,7 @@
Summary: Additional plugins for libtunepimp
Name: libtunepimp-extras-freeworld
Version: 0.5.3
-Release: 7%{?dist}
+Release: 11%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -21,6 +21,8 @@
Patch1: libtunepimp-0.5.3-gcc43.patch
Patch2: libtunepimp-0.5.3-glibc210_strrchr.patch
+# build against curl 7.21
+Patch3: libtunepimp-0.5.3-curl.patch
Patch10: libtunepimp-0.5.3-libmad.patch
@@ -64,6 +66,7 @@
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .glibc210_strrchr
+%patch3 -p1 -b .curl
# nuke rpath -- Rex
%if 0%{?use_autofoo}
@@ -119,6 +122,18 @@
%changelog
+* Wed May 02 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-11
+- fix for newer curl
+
+* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-10
+- Rebuilt for c++ ABI breakage
+
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
* Fri Apr 03 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 0.5.3-7
- fix build (port fedora/rawhide build fixes)
12 years
rpms/libtunepimp-extras-freeworld/F-17 libtunepimp-0.5.3-curl.patch, NONE, 1.1 libtunepimp-extras-freeworld.spec, 1.11, 1.12
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/libtunepimp-extras-freeworld/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8395
Modified Files:
libtunepimp-extras-freeworld.spec
Added Files:
libtunepimp-0.5.3-curl.patch
Log Message:
* Wed May 02 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-11
- fix for newer curl
libtunepimp-0.5.3-curl.patch:
protocol.cpp | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE libtunepimp-0.5.3-curl.patch ---
diff -up libtunepimp-0.5.3/lib/protocol.cpp.me libtunepimp-0.5.3/lib/protocol.cpp
--- libtunepimp-0.5.3/lib/protocol.cpp.me 2011-12-02 15:33:29.000000000 +0100
+++ libtunepimp-0.5.3/lib/protocol.cpp 2011-12-02 15:33:54.000000000 +0100
@@ -13,7 +13,6 @@
#include <map>
#include <expat.h>
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
using namespace std;
Index: libtunepimp-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/libtunepimp-extras-freeworld/F-17/libtunepimp-extras-freeworld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libtunepimp-extras-freeworld.spec 2 Mar 2012 14:51:09 -0000 1.11
+++ libtunepimp-extras-freeworld.spec 2 May 2012 17:44:26 -0000 1.12
@@ -2,7 +2,7 @@
Summary: Additional plugins for libtunepimp
Name: libtunepimp-extras-freeworld
Version: 0.5.3
-Release: 10%{?dist}
+Release: 11%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -21,6 +21,8 @@
Patch1: libtunepimp-0.5.3-gcc43.patch
Patch2: libtunepimp-0.5.3-glibc210_strrchr.patch
+# build against curl 7.21
+Patch3: libtunepimp-0.5.3-curl.patch
Patch10: libtunepimp-0.5.3-libmad.patch
@@ -64,6 +66,7 @@
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .glibc210_strrchr
+%patch3 -p1 -b .curl
# nuke rpath -- Rex
%if 0%{?use_autofoo}
@@ -119,6 +122,9 @@
%changelog
+* Wed May 02 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-11
+- fix for newer curl
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-10
- Rebuilt for c++ ABI breakage
12 years
rpms/libtunepimp-extras-freeworld/devel libtunepimp-0.5.3-curl.patch, NONE, 1.1 libtunepimp-extras-freeworld.spec, 1.11, 1.12
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/libtunepimp-extras-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8188
Modified Files:
libtunepimp-extras-freeworld.spec
Added Files:
libtunepimp-0.5.3-curl.patch
Log Message:
* Wed May 02 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-11
- fix for newer curl
libtunepimp-0.5.3-curl.patch:
protocol.cpp | 1 -
1 file changed, 1 deletion(-)
--- NEW FILE libtunepimp-0.5.3-curl.patch ---
diff -up libtunepimp-0.5.3/lib/protocol.cpp.me libtunepimp-0.5.3/lib/protocol.cpp
--- libtunepimp-0.5.3/lib/protocol.cpp.me 2011-12-02 15:33:29.000000000 +0100
+++ libtunepimp-0.5.3/lib/protocol.cpp 2011-12-02 15:33:54.000000000 +0100
@@ -13,7 +13,6 @@
#include <map>
#include <expat.h>
#include <curl/curl.h>
-#include <curl/types.h>
#include <curl/easy.h>
using namespace std;
Index: libtunepimp-extras-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/libtunepimp-extras-freeworld/devel/libtunepimp-extras-freeworld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libtunepimp-extras-freeworld.spec 2 Mar 2012 22:11:30 -0000 1.11
+++ libtunepimp-extras-freeworld.spec 2 May 2012 17:43:16 -0000 1.12
@@ -2,7 +2,7 @@
Summary: Additional plugins for libtunepimp
Name: libtunepimp-extras-freeworld
Version: 0.5.3
-Release: 10%{?dist}
+Release: 11%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@@ -21,6 +21,8 @@
Patch1: libtunepimp-0.5.3-gcc43.patch
Patch2: libtunepimp-0.5.3-glibc210_strrchr.patch
+# build against curl 7.21
+Patch3: libtunepimp-0.5.3-curl.patch
Patch10: libtunepimp-0.5.3-libmad.patch
@@ -64,6 +66,7 @@
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .glibc210_strrchr
+%patch3 -p1 -b .curl
# nuke rpath -- Rex
%if 0%{?use_autofoo}
@@ -119,6 +122,9 @@
%changelog
+* Wed May 02 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.3-11
+- fix for newer curl
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-10
- Rebuilt for c++ ABI breakage
12 years
rpms/fceultra/devel dead.package, NONE, 1.1 .cvsignore, 1.2, NONE Makefile, 1.1, NONE fceultra-0.98.13-acinclude.patch, 1.1, NONE fceultra-0.98.13-buffer_overflow.patch, 1.1, NONE fceultra-0.98.13-cheatdir.patch, 1.1, NONE fceultra-0.98.13-configure_fix_non_x86.patch, 1.1, NONE fceultra-0.98.13-lib.patch, 1.1, NONE fceultra-0.98.13-man.patch, 1.2, NONE fceultra-0.98.13-state-saving.patch, 1.1, NONE fceultra.spec, 1.5, NONE sources, 1.2, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/fceultra/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7308
Added Files:
dead.package
Removed Files:
.cvsignore Makefile fceultra-0.98.13-acinclude.patch
fceultra-0.98.13-buffer_overflow.patch
fceultra-0.98.13-cheatdir.patch
fceultra-0.98.13-configure_fix_non_x86.patch
fceultra-0.98.13-lib.patch fceultra-0.98.13-man.patch
fceultra-0.98.13-state-saving.patch fceultra.spec sources
Log Message:
fceultra is replaced by fceux
--- NEW FILE dead.package ---
Replaced by fceux
--- .cvsignore DELETED ---
--- Makefile DELETED ---
--- fceultra-0.98.13-acinclude.patch DELETED ---
--- fceultra-0.98.13-buffer_overflow.patch DELETED ---
--- fceultra-0.98.13-cheatdir.patch DELETED ---
--- fceultra-0.98.13-configure_fix_non_x86.patch DELETED ---
--- fceultra-0.98.13-lib.patch DELETED ---
--- fceultra-0.98.13-man.patch DELETED ---
--- fceultra-0.98.13-state-saving.patch DELETED ---
--- fceultra.spec DELETED ---
--- sources DELETED ---
12 years
rpms/mjpegtools/EL-6 mjpegtools_gcc470.patch, NONE, 1.1 mjpegtools.spec, 1.9, 1.10
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mjpegtools/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2958
Modified Files:
mjpegtools.spec
Added Files:
mjpegtools_gcc470.patch
Log Message:
Sync EL-6 with F-17.
mjpegtools_gcc470.patch:
MotionSearcher.hh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mjpegtools_gcc470.patch ---
--- a/y4mdenoise/MotionSearcher.hh
+++ b/y4mdenoise/MotionSearcher.hh
@@ -2196,7 +2196,7 @@
{
// This region is too small to be bothered with.
// Just get rid of it.
- DeleteRegion (a_pRegion);
+ this->DeleteRegion (a_pRegion);
}
else
{
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/EL-6/mjpegtools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mjpegtools.spec 1 May 2012 21:25:43 -0000 1.9
+++ mjpegtools.spec 2 May 2012 14:48:45 -0000 1.10
@@ -1,12 +1,13 @@
Name: mjpegtools
Version: 2.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
URL: http://mjpeg.sourceforge.net/
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
Patch0: mjpegtools-2.0.0-no-config-in-public-header.h
+Patch1: mjpegtools_gcc470.patch
BuildRequires: libjpeg-devel
BuildRequires: nasm
BuildRequires: libdv-devel
@@ -96,6 +97,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
for f in docs/yuvfps.1 ; do
@@ -181,6 +183,9 @@
%changelog
+* Wed May 02 2012 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-4
+- Add patch for gcc 4.7
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-3
- Rebuilt for c++ ABI breakage
12 years
rpms/mjpegtools/F-17 mjpegtools_gcc470.patch, NONE, 1.1 mjpegtools.spec, 1.8, 1.9
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/mjpegtools/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31585
Modified Files:
mjpegtools.spec
Added Files:
mjpegtools_gcc470.patch
Log Message:
* Wed May 02 2012 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-4
- Add patch for gcc 4.7
mjpegtools_gcc470.patch:
MotionSearcher.hh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mjpegtools_gcc470.patch ---
--- a/y4mdenoise/MotionSearcher.hh
+++ b/y4mdenoise/MotionSearcher.hh
@@ -2196,7 +2196,7 @@
{
// This region is too small to be bothered with.
// Just get rid of it.
- DeleteRegion (a_pRegion);
+ this->DeleteRegion (a_pRegion);
}
else
{
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/F-17/mjpegtools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mjpegtools.spec 2 Mar 2012 14:55:55 -0000 1.8
+++ mjpegtools.spec 2 May 2012 12:48:39 -0000 1.9
@@ -1,12 +1,13 @@
Name: mjpegtools
Version: 2.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
URL: http://mjpeg.sourceforge.net/
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
Patch0: mjpegtools-2.0.0-no-config-in-public-header.h
+Patch1: mjpegtools_gcc470.patch
BuildRequires: libjpeg-devel
BuildRequires: nasm
BuildRequires: libdv-devel
@@ -96,6 +97,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
for f in docs/yuvfps.1 ; do
@@ -181,6 +183,9 @@
%changelog
+* Wed May 02 2012 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-4
+- Add patch for gcc 4.7
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-3
- Rebuilt for c++ ABI breakage
12 years
rpms/mjpegtools/devel mjpegtools_gcc470.patch, NONE, 1.1 mjpegtools.spec, 1.8, 1.9
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/mjpegtools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31438
Modified Files:
mjpegtools.spec
Added Files:
mjpegtools_gcc470.patch
Log Message:
* Wed May 02 2012 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-4
- Add patch for gcc 4.7
mjpegtools_gcc470.patch:
MotionSearcher.hh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE mjpegtools_gcc470.patch ---
--- a/y4mdenoise/MotionSearcher.hh
+++ b/y4mdenoise/MotionSearcher.hh
@@ -2196,7 +2196,7 @@
{
// This region is too small to be bothered with.
// Just get rid of it.
- DeleteRegion (a_pRegion);
+ this->DeleteRegion (a_pRegion);
}
else
{
Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mjpegtools.spec 2 Mar 2012 22:12:57 -0000 1.8
+++ mjpegtools.spec 2 May 2012 12:45:49 -0000 1.9
@@ -1,12 +1,13 @@
Name: mjpegtools
Version: 2.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tools to manipulate MPEG data
Group: Applications/Multimedia
License: GPLv2
URL: http://mjpeg.sourceforge.net/
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
Patch0: mjpegtools-2.0.0-no-config-in-public-header.h
+Patch1: mjpegtools_gcc470.patch
BuildRequires: libjpeg-devel
BuildRequires: nasm
BuildRequires: libdv-devel
@@ -96,6 +97,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i -e 's/ARCHFLAGS=.*/ARCHFLAGS=/' configure*
sed -i -e 's|/lib /usr/lib|/%{_lib} %{_libdir}|' configure # lib64 rpaths
for f in docs/yuvfps.1 ; do
@@ -181,6 +183,9 @@
%changelog
+* Wed May 02 2012 Sérgio Basto <sergio(a)serjux.com> - 2.0.0-4
+- Add patch for gcc 4.7
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.0-3
- Rebuilt for c++ ABI breakage
12 years
rpms/perl-Crypt-IDEA/F-17 perl-Crypt-IDEA.spec,1.7,1.8
by Paul Howarth
Author: pghmcfc
Update of /cvs/free/rpms/perl-Crypt-IDEA/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24863
Modified Files:
perl-Crypt-IDEA.spec
Log Message:
- Spec clean-up:
- Don't need to remove empty directories from buildroot
- Drop %defattr, redundant since rpm 4.4
Index: perl-Crypt-IDEA.spec
===================================================================
RCS file: /cvs/free/rpms/perl-Crypt-IDEA/F-17/perl-Crypt-IDEA.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Crypt-IDEA.spec 19 Feb 2012 21:45:32 -0000 1.7
+++ perl-Crypt-IDEA.spec 2 May 2012 09:04:39 -0000 1.8
@@ -1,7 +1,7 @@
Summary: Perl interface to IDEA block cipher
Name: perl-Crypt-IDEA
Version: 1.08
-Release: 8%{?dist}
+Release: 9%{?dist}
License: BSD with advertising
Group: Development/Libraries
Url: http://search.cpan.org/dist/Crypt-IDEA/
@@ -42,7 +42,6 @@
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
%{_fixperms} %{buildroot}
%check
@@ -52,13 +51,17 @@
rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc COPYRIGHT changes
%{perl_vendorarch}/Crypt/
%{perl_vendorarch}/auto/Crypt/
%{_mandir}/man3/Crypt::IDEA.3pm*
%changelog
+* Wed May 2 2012 Paul Howarth <paul(a)city-fan.org> - 1.08-9
+- Spec clean-up:
+ - Don't need to remove empty directories from buildroot
+ - Drop %%defattr, redundant since rpm 4.4
+
* Thu Feb 16 2012 Paul Howarth <paul(a)city-fan.org> - 1.08-8
- Spec clean-up:
- Don't use macros for commands
12 years
rpms/perl-Crypt-IDEA/devel perl-Crypt-IDEA.spec,1.7,1.8
by Paul Howarth
Author: pghmcfc
Update of /cvs/free/rpms/perl-Crypt-IDEA/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24667
Modified Files:
perl-Crypt-IDEA.spec
Log Message:
- Spec clean-up:
- Don't need to remove empty directories from buildroot
- Drop %defattr, redundant since rpm 4.4
Index: perl-Crypt-IDEA.spec
===================================================================
RCS file: /cvs/free/rpms/perl-Crypt-IDEA/devel/perl-Crypt-IDEA.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Crypt-IDEA.spec 16 Feb 2012 15:02:09 -0000 1.7
+++ perl-Crypt-IDEA.spec 2 May 2012 09:03:05 -0000 1.8
@@ -1,7 +1,7 @@
Summary: Perl interface to IDEA block cipher
Name: perl-Crypt-IDEA
Version: 1.08
-Release: 8%{?dist}
+Release: 9%{?dist}
License: BSD with advertising
Group: Development/Libraries
Url: http://search.cpan.org/dist/Crypt-IDEA/
@@ -42,7 +42,6 @@
make pure_install DESTDIR=%{buildroot}
find %{buildroot} -type f -name .packlist -exec rm -f {} \;
find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} \;
-find %{buildroot} -depth -type d -exec rmdir {} \; 2>/dev/null
%{_fixperms} %{buildroot}
%check
@@ -52,13 +51,17 @@
rm -rf %{buildroot}
%files
-%defattr(-,root,root,-)
%doc COPYRIGHT changes
%{perl_vendorarch}/Crypt/
%{perl_vendorarch}/auto/Crypt/
%{_mandir}/man3/Crypt::IDEA.3pm*
%changelog
+* Wed May 2 2012 Paul Howarth <paul(a)city-fan.org> - 1.08-9
+- Spec clean-up:
+ - Don't need to remove empty directories from buildroot
+ - Drop %%defattr, redundant since rpm 4.4
+
* Thu Feb 16 2012 Paul Howarth <paul(a)city-fan.org> - 1.08-8
- Spec clean-up:
- Don't use macros for commands
12 years
rpms/php-pecl-pdflib/F-17 pdflib-php54.patch, NONE, 1.1 php-pecl-pdflib.spec, 1.10, 1.11
by Remi Collet
Author: remi
Update of /cvs/nonfree/rpms/php-pecl-pdflib/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23917
Modified Files:
php-pecl-pdflib.spec
Added Files:
pdflib-php54.patch
Log Message:
rebuild for php 5.4
pdflib-php54.patch:
pdf.c | 4 ++++
pdf7.c | 4 ++++
2 files changed, 8 insertions(+)
--- NEW FILE pdflib-php54.patch ---
diff -up pdflib-2.1.8/pdf7.c.php54 pdflib-2.1.8/pdf7.c
--- pdflib-2.1.8/pdf7.c.php54 2011-11-27 08:55:33.068642986 +0100
+++ pdflib-2.1.8/pdf7.c 2011-11-27 08:56:40.703860070 +0100
@@ -332,10 +332,14 @@ pdflib_object_new_ex(zend_class_entry *c
ALLOC_HASHTABLE(intern->std.properties);
zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+#if PHP_VERSION_ID < 50399
zend_hash_copy(intern->std.properties,
&class_type->default_properties,
(copy_ctor_func_t) zval_add_ref,
(void *) &tmp, sizeof(zval *));
+#else
+ object_properties_init( (zend_object*)intern, class_type );
+#endif
retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t)pdflib_object_dtor,
diff -up pdflib-2.1.8/pdf.c.php54 pdflib-2.1.8/pdf.c
--- pdflib-2.1.8/pdf.c.php54 2011-11-27 08:53:51.378310945 +0100
+++ pdflib-2.1.8/pdf.c 2011-11-27 08:56:31.184829597 +0100
@@ -766,10 +766,14 @@ pdflib_object_new_ex(zend_class_entry *c
ALLOC_HASHTABLE(intern->std.properties);
zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+#if PHP_VERSION_ID < 50399
zend_hash_copy(intern->std.properties,
&class_type->default_properties,
(copy_ctor_func_t) zval_add_ref,
(void *) &tmp, sizeof(zval *));
+#else
+ object_properties_init( (zend_object*)intern, class_type );
+#endif
retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t)pdflib_object_dtor,
Index: php-pecl-pdflib.spec
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/F-17/php-pecl-pdflib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-pecl-pdflib.spec 8 Feb 2012 23:47:12 -0000 1.10
+++ php-pecl-pdflib.spec 2 May 2012 08:43:07 -0000 1.11
@@ -9,7 +9,7 @@
Summary(fr): Extension pour générer des fichiers PDF
Name: php-pecl-pdflib
Version: 2.1.8
-Release: 3%{?dist}.1
+Release: 4%{?dist}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/pdflib
@@ -18,24 +18,28 @@
Source2: xml2changelog
+# https://bugs.php.net/60397 php 5.4 build
+Patch0: pdflib-php54.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides: php-pecl(pdflib) = %{version}-%{release}, php-pdflib = %{version}-%{release}
BuildRequires: php-devel, pdflib-lite-devel, php-pear
+
Requires(post): %{__pecl}
Requires(postun): %{__pecl}
%if 0%{?php_zend_api:1}
-Requires: php(zend-abi) = %{php_zend_api}
-Requires: php(api) = %{php_core_api}
+Requires: php(zend-abi) = %{php_zend_api}
+Requires: php(api) = %{php_core_api}
%else
-Requires: php-api = %{php_apiver}
+Requires: php-api = %{php_apiver}
%endif
+Provides: php-pecl(pdflib) = %{version}-%{release}
+Provides: php-pdflib = %{version}-%{release}
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
-%{?filter_setup:
-%filter_provides_in %{php_extdir}/.*\.so$
-%filter_setup
-}
-%endif
+# RPM 4.8
+%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
+%{?filter_setup}
+# RPM 4.9
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$
%description
@@ -58,31 +62,38 @@
%setup -c -q
%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-cd pdflib-%{version}
+%patch0 -p0 -b .php54
+
+# Check version
+extver=$(sed -n '/#define PHP_PDFLIB_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/php_pdflib.h)
+if test "x${extver}" != "x%{version}"; then
+ : Error: Upstream version is ${extver}, expecting %{version}.
+ exit 1
+fi
%build
cd pdflib-%{version}
phpize
%configure
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
%install
cd pdflib-%{version}
-%{__rm} -rf %{buildroot}
-%{__make} install INSTALL_ROOT=%{buildroot}
+rm -rf %{buildroot}
+make install INSTALL_ROOT=%{buildroot}
# Drop in the bit of configuration
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
-%{__cat} > %{buildroot}%{_sysconfdir}/php.d/%{extname}.ini << 'EOF'
+mkdir -p %{buildroot}%{_sysconfdir}/php.d
+cat > %{buildroot}%{_sysconfdir}/php.d/%{extname}.ini << 'EOF'
; Enable PDFlib extension module
extension=%{extname}.so
EOF
# Install XML package description
-%{__mkdir_p} %{buildroot}%{pecl_xmldir}
-%{__install} -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+mkdir -p %{buildroot}%{pecl_xmldir}
+install -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
%check
@@ -108,7 +119,7 @@
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%files
@@ -120,6 +131,10 @@
%changelog
+* Wed May 02 2012 Remi Collet <rpmfusion(a)FamilleCollet.com> 2.1.8-4
+- add patch for php 5.4
+- fix filter for private .so
+
* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.8-3.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years