From 254314ee53999fd8cfc7f201c8e733e16f532735 Mon Sep 17 00:00:00 2001 From: oddsocks Date: Thu, 7 Sep 2006 21:12:08 +0000 Subject: [PATCH 01/64] auto-import zvbi-0.2.22-2 on branch devel from zvbi-0.2.22-2.src.rpm --- .cvsignore | 1 + sources | 1 + zvbi.spec | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+) create mode 100644 zvbi.spec diff --git a/.cvsignore b/.cvsignore index e69de29..45869e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zvbi-0.2.22.tar.bz2 diff --git a/sources b/sources index e69de29..c0a494f 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +a01cbe39a48579ba92582ff75a5e37c2 zvbi-0.2.22.tar.bz2 diff --git a/zvbi.spec b/zvbi.spec new file mode 100644 index 0000000..fd74ec8 --- /dev/null +++ b/zvbi.spec @@ -0,0 +1,158 @@ +Name: zvbi +Version: 0.2.22 +Release: 2%{?dist} +Summary: Raw VBI, Teletext and Closed Caption decoding library + +Group: System Environment/Libraries +License: GPL +URL: http://zapping.sourceforge.net/ZVBI/index.html +Source0: http://dl.sf.net/zapping/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: doxygen +BuildRequires: gettext +BuildRequires: libpng-devel +BuildRequires: libICE-devel +BuildRequires: xorg-x11-font-utils +BuildRequires: fontconfig +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(postun): /sbin/service + +%description +ZVBI provides functions to capture and decode VBI data. The vertical blanking +interval (VBI) is an interval in a television signal that temporarily suspends +transmission of the signal for the electron gun to move back up to the first +line of the television screen to trace the next screen field. The vertical +blanking interval can be used to carry data, since anything sent during the VBI +would naturally not be displayed; various test signals, closed captioning, and +other digital data can be sent during this time period. + + +%package devel +Summary: Development files for zvbi +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig + +%description devel +Development files for zvbi + + +%package fonts +Summary: Fonts from zvbi converted to X11 +Group: User Interface/X + +%description fonts +Fonts from zvbi converted for use with X11 + + +%prep +%setup -q + + +%build +# Note: We don't do --enable-static=no because static libs are needed to build +# x11font during compile time to convert zvbi fonts into x11 fonts. x11font +# is thrown away and not installed because it's not useful for anything else +%configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy +make %{?_smp_mflags} + + +%install +rm -rf %{buildroot} +mkdir -p %{buildroot}%{_datadir}/fonts/%{name} +mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d +make install DESTDIR=%{buildroot} + +#Find locales +%find_lang %{name} + +#Install init script +install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid + +#Generate and install fonts +pushd contrib +./x11font +bdftopcf teletext.bdf | gzip -9 -c > %{buildroot}%{_datadir}/fonts/%{name}/teletext.pcf.gz +bdftopcf teletexti.bdf | gzip -9 -c > %{buildroot}%{_datadir}/fonts/%{name}/teletexti.pcf.gz +bdftopcf caption.bdf | gzip -9 -c > %{buildroot}%{_datadir}/fonts/%{name}/caption.pcf.gz +bdftopcf captioni.bdf | gzip -9 -c > %{buildroot}%{_datadir}/fonts/%{name}/captioni.pcf.gz +popd + +# %%ghost the fonts.cache-1 file +touch %{buildroot}%{_datadir}/fonts/%{name}/fonts.cache-1 + +#Some cleanups +rm -f %{buildroot}%{_libdir}/*.a +rm -f %{buildroot}%{_libdir}/*.la + + +%clean +rm -rf %{buildroot} + + +%post +/sbin/ldconfig +/sbin/chkconfig --add zvbid + + +%postun +/sbin/ldconfig +if [ "$1" -ge "1" ]; then + /sbin/service zvbid condrestart >/dev/null 2>&1 || : +fi + + +%preun +if [ $1 = 0 ]; then + /sbin/service zvbid stop >/dev/null 2>&1 || : + /sbin/chkconfig --del zvbid +fi + + +%post fonts +if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f %{_datadir}/fonts/%{name} +fi + + +%postun fonts +if [ "$1" = "0" ]; then + if [ -x /usr/bin/fc-cache ]; then + /usr/bin/fc-cache -f %{_datadir}/fonts + fi +fi + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%{_bindir}/%{name}-chains +%{_bindir}/%{name}-ntsc-cc +%{_sbindir}/zvbid +%{_sysconfdir}/rc.d/init.d/zvbid +%{_libdir}/libzvbi-chains.so.0* +%{_libdir}/libzvbi.so.0* +%{_mandir}/man1/zvbi* +%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO + + +%files devel +%{_includedir}/libzvbi.h +%{_libdir}/libzvbi-chains.so +%{_libdir}/libzvbi.so +%{_libdir}/pkgconfig/%{name}-0.2.pc + + +%files fonts +%dir %{_datadir}/fonts/%{name} +%{_datadir}/fonts/%{name}/*.gz +%ghost %{_datadir}/fonts/%{name}/fonts.cache-1 + + +%changelog +* Fri Sep 01 2006 Ian Chapman 0.2.22-2%{?dist} +- Minor spec cleanups + +* Tue Aug 29 2006 Ian Chapman 0.2.22-1%{?dist} +- Initial release \ No newline at end of file From 77415a7cf73a655b153137ae2fb4425799e9c19b Mon Sep 17 00:00:00 2001 From: oddsocks Date: Wed, 14 Mar 2007 20:22:42 +0000 Subject: [PATCH 02/64] auto-import zvbi-0.2.24-1 on branch devel from zvbi-0.2.24-1.src.rpm --- .cvsignore | 2 +- sources | 2 +- zvbi-0.2.24-tvfonts.patch | 128 ++++++++++++++++++++++++++++++++++++++ zvbi.spec | 86 ++++++++++++++++--------- 4 files changed, 186 insertions(+), 32 deletions(-) create mode 100644 zvbi-0.2.24-tvfonts.patch diff --git a/.cvsignore b/.cvsignore index 45869e1..9d66e44 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zvbi-0.2.22.tar.bz2 +zvbi-0.2.24.tar.bz2 diff --git a/sources b/sources index c0a494f..70d3642 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a01cbe39a48579ba92582ff75a5e37c2 zvbi-0.2.22.tar.bz2 +918c8ebb03c0e2f3272e0d90a92f2289 zvbi-0.2.24.tar.bz2 diff --git a/zvbi-0.2.24-tvfonts.patch b/zvbi-0.2.24-tvfonts.patch new file mode 100644 index 0000000..8d74388 --- /dev/null +++ b/zvbi-0.2.24-tvfonts.patch @@ -0,0 +1,128 @@ +diff -Nrbu zvbi-0.2.22/contrib/x11font.c zvbi-0.2.22-OK/contrib/x11font.c +--- zvbi-0.2.24/contrib/x11font.c.orig 2006-02-10 09:25:36.000000000 +0300 ++++ zvbi-0.2.24/contrib/x11font.c 2007-03-12 16:55:06.000000000 +0300 +@@ -12,31 +12,31 @@ + { + fprintf(fp, + "STARTFONT 2.1\n" +- "FONT -%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\n" ++ "FONT -%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\n" + "SIZE %d 75 75\n" +- "FONTBOUNDINGBOX 6 13 0 -2\n" ++ "FONTBOUNDINGBOX %d %d 0 0\n" + "STARTPROPERTIES 25\n" + "FONTNAME_REGISTRY \"\"\n" + "FOUNDRY \"%s\"\n" + "FAMILY_NAME \"%s\"\n" +- "WEIGHT_NAME \"medium\"\n" ++ "WEIGHT_NAME \"Medium\"\n" + "SLANT \"%s\"\n" +- "SETWIDTH_NAME \"normal\"\n" ++ "SETWIDTH_NAME \"Normal\"\n" + "ADD_STYLE_NAME \"\"\n" + "PIXEL_SIZE %d\n" + "POINT_SIZE %d\n" + "RESOLUTION_X 75\n" + "RESOLUTION_Y 75\n" +- "SPACING \"c\"\n" ++ "SPACING \"C\"\n" + "AVERAGE_WIDTH %d\n" +- "CHARSET_REGISTRY \"iso10646\"\n" ++ "CHARSET_REGISTRY \"ISO10646\"\n" + "CHARSET_ENCODING \"1\"\n" + "COPYRIGHT \"fixme\"\n" + "CAP_HEIGHT 9\n" + "X_HEIGHT 18\n" +- "FONT \"-%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\"\n" ++ "FONT \"-%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\"\n" + "WEIGHT 10\n" +- "RESOLUTION 103\n" ++ "RESOLUTION 75\n" + "QUAD_WIDTH %d\n" + "DEFAULT_CHAR 0\n" + "FONT_ASCENT %d\n" +@@ -44,6 +44,7 @@ + "ENDPROPERTIES\n", + foundry,name,slant,height,height*10,width*10, + height, ++ width,height, + foundry,name,slant,height,height*10,width*10, + foundry,name,slant,height,height*10,width*10, + width,height); +@@ -53,11 +54,11 @@ + print_font(const char *filename, + const char *foundry, + const char *name, int italic, +- uint8_t *font, int cw, int ch, int cpl, ++ uint8_t *font, int cw, int ch, int cpl, int hs, + int count, unsigned int (*map)(unsigned int,int), int invalid) + { + FILE *fp; +- int x,y,i,c,on,bit,byte,mask1,mask2; ++ int x,y,s,i,c,on,bit,byte,mask1,mask2; + + fp = stdout; + if (NULL != filename) { +@@ -67,7 +68,7 @@ + fprintf(stderr,"writing %s\n",filename); + } + +- print_head(fp, foundry, name, italic ? "i" : "r", cw, ch); ++ print_head(fp, foundry, name, italic ? "I" : "R", cw, ch*hs); + fprintf(fp,"CHARS %d\n", count); + + for (i = 0; i < 0xffff; i++) { +@@ -82,8 +83,9 @@ + "BBX %d %d 0 0\n" + "BITMAP\n", + i,cw*10,cw, +- cw,ch); ++ cw,ch*hs); + for (y = 0; y < ch; y++) { ++ for (s = 0; s < hs; s++) { + bit = cpl * cw * y + cw * c; + byte = 0; + for (x = 0; x < cw; x++) { +@@ -100,6 +102,7 @@ + } + fprintf(fp,"%02x\n",byte); + } ++ } + fprintf(fp,"ENDCHAR\n"); + } + fprintf(fp,"ENDFONT\n"); +@@ -109,17 +112,23 @@ + } + + int +-main () ++main(int argc, char *argv[]) + { +- print_font("teletext.bdf","ets","teletext",0,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1448,unicode_wstfont2,357); +- print_font("teletexti.bdf","ets","teletext",1,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1449,unicode_wstfont2,357); +- print_font("caption.bdf","ets","caption",0,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15); +- print_font("captioni.bdf","ets","caption",1,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15 + 4 * 32); ++ print_font("teletext1.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,1,1448,unicode_wstfont2,357); ++ print_font("teletext2.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,2,1448,unicode_wstfont2,357); ++ print_font("teletext4.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,4,1448,unicode_wstfont2,357); ++ print_font("teletext1i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,1,1449,unicode_wstfont2,357); ++ print_font("teletext2i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,2,1449,unicode_wstfont2,357); ++ print_font("teletext4i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,4,1449,unicode_wstfont2,357); ++ print_font("caption.bdf","Ets","Caption",0,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15); ++ print_font("captioni.bdf","Ets","Caption",1,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15 + 4 * 32); + return 0; + } +- +- diff --git a/zvbi.spec b/zvbi.spec index fd74ec8..dcbbb2d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -1,19 +1,19 @@ Name: zvbi -Version: 0.2.22 -Release: 2%{?dist} +Version: 0.2.24 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library - Group: System Environment/Libraries License: GPL URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://dl.sf.net/zapping/%{name}-%{version}.tar.bz2 +Patch0: zvbi-0.2.24-tvfonts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen +BuildRequires: fontconfig BuildRequires: gettext BuildRequires: libpng-devel BuildRequires: libICE-devel BuildRequires: xorg-x11-font-utils -BuildRequires: fontconfig Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -42,6 +42,12 @@ Development files for zvbi %package fonts Summary: Fonts from zvbi converted to X11 Group: User Interface/X +Requires(post): fontconfig +Requires(postun): fontconfig +Requires(post): chkfontpath +Requires(postun): chkfontpath +Obsoletes: xawtv-tv-fonts < 3.95 +Provides: xawtv-tv-fonts >= 3.95 %description fonts Fonts from zvbi converted for use with X11 @@ -49,6 +55,13 @@ Fonts from zvbi converted for use with X11 %prep %setup -q +%patch -p1 -b .orig + +#Fix character encodings (note ChangeLog's encoding is broken, hence sed) +sed -i 's/\xC3\xB2/\xF2/g' ChangeLog +sed -i 's/\xC2\x81//g' ChangeLog +iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog +iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README %build @@ -58,6 +71,19 @@ Fonts from zvbi converted for use with X11 %configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy make %{?_smp_mflags} +#Generate fonts, fonts.alias and fonts.dir +pushd contrib +./x11font +for font in *.bdf +do + bdftopcf $font | gzip -9 -c > ${font%.bdf}.pcf.gz +done +mkfontdir -x .bdf . +cat >fonts.alias < %{buildroot}%{_datadir}/fonts/%{name}/teletext.pcf.gz -bdftopcf teletexti.bdf | gzip -9 -c > %{buildroot}%{_datadir}/fonts/%{name}/teletexti.pcf.gz -bdftopcf caption.bdf | gzip -9 -c > %{buildroot}%{_datadir}/fonts/%{name}/caption.pcf.gz -bdftopcf captioni.bdf | gzip -9 -c > %{buildroot}%{_datadir}/fonts/%{name}/captioni.pcf.gz -popd +#Install fonts +install -m 0644 contrib/*.pcf.gz %{buildroot}%{_datadir}/fonts/%{name} +install -m 0644 contrib/fonts.* %{buildroot}%{_datadir}/fonts/%{name} -# %%ghost the fonts.cache-1 file +#%%ghost the fonts.cache-1 and fonts.dir touch %{buildroot}%{_datadir}/fonts/%{name}/fonts.cache-1 -#Some cleanups -rm -f %{buildroot}%{_libdir}/*.a -rm -f %{buildroot}%{_libdir}/*.la - %clean rm -rf %{buildroot} @@ -112,45 +129,54 @@ fi %post fonts -if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache -f %{_datadir}/fonts/%{name} -fi +fc-cache -f %{_datadir}/fonts/%{name} || : +chkfontpath -q -a %{_datadir}/fonts/%{name} || : %postun fonts if [ "$1" = "0" ]; then - if [ -x /usr/bin/fc-cache ]; then - /usr/bin/fc-cache -f %{_datadir}/fonts - fi + fc-cache -f %{_datadir}/fonts || : + chkfontpath -q -r %{_datadir}/fonts/%{name} || : fi %files -f %{name}.lang %defattr(-,root,root,-) -%{_bindir}/%{name}-chains -%{_bindir}/%{name}-ntsc-cc +%{_bindir}/%{name}* %{_sbindir}/zvbid %{_sysconfdir}/rc.d/init.d/zvbid -%{_libdir}/libzvbi-chains.so.0* -%{_libdir}/libzvbi.so.0* -%{_mandir}/man1/zvbi* +%{_libdir}/*.so.* +%{_mandir}/man1/* +%exclude %{_libdir}/*.a +%exclude %{_libdir}/*.la %doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO %files devel %{_includedir}/libzvbi.h -%{_libdir}/libzvbi-chains.so -%{_libdir}/libzvbi.so +%{_libdir}/*.so %{_libdir}/pkgconfig/%{name}-0.2.pc %files fonts %dir %{_datadir}/fonts/%{name} %{_datadir}/fonts/%{name}/*.gz +%{_datadir}/fonts/%{name}/fonts.dir +%{_datadir}/fonts/%{name}/fonts.alias %ghost %{_datadir}/fonts/%{name}/fonts.cache-1 %changelog +* Tue Mar 13 2007 Ian Chapman 0.2.24-1%{?dist} +- Upgrade to 0.2.24 +- Convert README and ChangeLog to UTF-8 +- Added patch for x11font to generate more font sizes useful for other + applications such as xawtv (courtesy of Dmitry Butskoy) +- Fonts sub-rpm now obsoletes and provides xawtv-tv-fonts +- Split font generation and font installation into separate sections +- Various other minor changes to the spec +- Added xfs support for the fonts + * Fri Sep 01 2006 Ian Chapman 0.2.22-2%{?dist} - Minor spec cleanups From f6a9ce595d25738ba4743ec647f988f1433cac3b Mon Sep 17 00:00:00 2001 From: oddsocks Date: Wed, 30 May 2007 00:12:57 +0000 Subject: [PATCH 03/64] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- zvbi.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9d66e44..ed17137 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zvbi-0.2.24.tar.bz2 +zvbi-0.2.25.tar.bz2 diff --git a/sources b/sources index 70d3642..12212b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -918c8ebb03c0e2f3272e0d90a92f2289 zvbi-0.2.24.tar.bz2 +b63c626baf1fc385df04d88bc9628a4a zvbi-0.2.25.tar.bz2 diff --git a/zvbi.spec b/zvbi.spec index dcbbb2d..ae8603e 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -1,5 +1,5 @@ Name: zvbi -Version: 0.2.24 +Version: 0.2.25 Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries @@ -167,6 +167,9 @@ fi %changelog +* Sun May 27 2007 Ian Chapman 0.2.25-1%{?dist} +- Upgrade to 0.2.25 + * Tue Mar 13 2007 Ian Chapman 0.2.24-1%{?dist} - Upgrade to 0.2.24 - Convert README and ChangeLog to UTF-8 From d8e1d67e2e39b83ab0c620d0f2a524a33b629a7c Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sat, 25 Aug 2007 00:57:55 +0000 Subject: [PATCH 04/64] *** empty log message *** --- zvbi-0.2.25-openfix.patch | 11 +++++++ zvbi.spec | 62 +++++++++++++++++++++++++++------------ 2 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 zvbi-0.2.25-openfix.patch diff --git a/zvbi-0.2.25-openfix.patch b/zvbi-0.2.25-openfix.patch new file mode 100644 index 0000000..5d8ab6f --- /dev/null +++ b/zvbi-0.2.25-openfix.patch @@ -0,0 +1,11 @@ +--- zvbi-0.2.25/src/chains.c.orig 2007-03-09 05:11:52.000000000 +0000 ++++ zvbi-0.2.25/src/chains.c 2007-08-23 21:29:44.000000000 +0100 +@@ -168,7 +168,7 @@ + return 0; + } + +-int open(const char *pathname, int flags, ...) ++int (open)(const char *pathname, int flags, ...) + { + va_list args; + mode_t mode = 0; diff --git a/zvbi.spec b/zvbi.spec index ae8603e..a9430fc 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -1,12 +1,16 @@ +%define fontdir %{_datadir}/fonts/%{name} +%define catalogue %{_sysconfdir}/X11/fontpath.d + Name: zvbi Version: 0.2.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries -License: GPL +License: GPLv2+ URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://dl.sf.net/zapping/%{name}-%{version}.tar.bz2 Patch0: zvbi-0.2.24-tvfonts.patch +Patch1: zvbi-0.2.25-openfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig @@ -44,8 +48,11 @@ Summary: Fonts from zvbi converted to X11 Group: User Interface/X Requires(post): fontconfig Requires(postun): fontconfig +# Don't use chkfontpath for F8+, it's legacy. +%if 0%{?fedora} <= 7 Requires(post): chkfontpath Requires(postun): chkfontpath +%endif Obsoletes: xawtv-tv-fonts < 3.95 Provides: xawtv-tv-fonts >= 3.95 @@ -56,6 +63,7 @@ Fonts from zvbi converted for use with X11 %prep %setup -q %patch -p1 -b .orig +%patch1 -p1 #Fix character encodings (note ChangeLog's encoding is broken, hence sed) sed -i 's/\xC3\xB2/\xF2/g' ChangeLog @@ -67,7 +75,7 @@ iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README %build # Note: We don't do --enable-static=no because static libs are needed to build # x11font during compile time to convert zvbi fonts into x11 fonts. x11font -# is thrown away and not installed because it's not useful for anything else +# is thrown away and not installed as it's not useful for anything else %configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy make %{?_smp_mflags} @@ -87,7 +95,7 @@ popd %install rm -rf %{buildroot} -mkdir -p %{buildroot}%{_datadir}/fonts/%{name} +mkdir -p %{buildroot}%{fontdir} mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d make install DESTDIR=%{buildroot} @@ -98,11 +106,16 @@ make install DESTDIR=%{buildroot} install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid #Install fonts -install -m 0644 contrib/*.pcf.gz %{buildroot}%{_datadir}/fonts/%{name} -install -m 0644 contrib/fonts.* %{buildroot}%{_datadir}/fonts/%{name} +install -m 0644 contrib/*.pcf.gz %{buildroot}%{fontdir} +install -m 0644 contrib/fonts.* %{buildroot}%{fontdir} #%%ghost the fonts.cache-1 and fonts.dir -touch %{buildroot}%{_datadir}/fonts/%{name}/fonts.cache-1 +touch %{buildroot}%{fontdir}/fonts.cache-1 + +%if 0%{?fedora} > 7 +mkdir -p %{buildroot}%{catalogue} +ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} +%endif %clean @@ -130,13 +143,17 @@ fi %post fonts fc-cache -f %{_datadir}/fonts/%{name} || : -chkfontpath -q -a %{_datadir}/fonts/%{name} || : +%if 0%{?fedora} <= 7 +chkfontpath -q -a %{fontdir} || : +%endif %postun fonts if [ "$1" = "0" ]; then fc-cache -f %{_datadir}/fonts || : - chkfontpath -q -r %{_datadir}/fonts/%{name} || : +%if 0%{?fedora} <= 7 + chkfontpath -q -r %{fontdir} || : +%endif fi @@ -160,17 +177,26 @@ fi %files fonts %dir %{_datadir}/fonts/%{name} -%{_datadir}/fonts/%{name}/*.gz -%{_datadir}/fonts/%{name}/fonts.dir -%{_datadir}/fonts/%{name}/fonts.alias -%ghost %{_datadir}/fonts/%{name}/fonts.cache-1 +%{fontdir}/*.gz +%{fontdir}/fonts.dir +%{fontdir}/fonts.alias +%if 0%{?fedora} > 7 +%{catalogue}/%{name} +%endif +%ghost %{fontdir}/fonts.cache-1 %changelog -* Sun May 27 2007 Ian Chapman 0.2.25-1%{?dist} +* Wed Aug 22 2007 Ian Chapman 0.2.25-2 +- Release bump for F8 mass rebuild +- License change due to new guidelines +- Use fontpath.d for F8+ +- Added patch to fix compilation with open() macro on F8+ + +* Sun May 27 2007 Ian Chapman 0.2.25-1 - Upgrade to 0.2.25 -* Tue Mar 13 2007 Ian Chapman 0.2.24-1%{?dist} +* Tue Mar 13 2007 Ian Chapman 0.2.24-1 - Upgrade to 0.2.24 - Convert README and ChangeLog to UTF-8 - Added patch for x11font to generate more font sizes useful for other @@ -180,8 +206,8 @@ fi - Various other minor changes to the spec - Added xfs support for the fonts -* Fri Sep 01 2006 Ian Chapman 0.2.22-2%{?dist} +* Fri Sep 01 2006 Ian Chapman 0.2.22-2 - Minor spec cleanups -* Tue Aug 29 2006 Ian Chapman 0.2.22-1%{?dist} -- Initial release \ No newline at end of file +* Tue Aug 29 2006 Ian Chapman 0.2.22-1 +- Initial release From cefb4b0fc852b151da272bbca211e42694746b67 Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sun, 6 Jan 2008 22:23:59 +0000 Subject: [PATCH 05/64] *** empty log message *** --- zvbi.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index a9430fc..1d45971 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,19 +2,19 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.25 -Release: 2%{?dist} +Version: 0.2.26 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries License: GPLv2+ URL: http://zapping.sourceforge.net/ZVBI/index.html -Source0: http://dl.sf.net/zapping/%{name}-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 Patch0: zvbi-0.2.24-tvfonts.patch Patch1: zvbi-0.2.25-openfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig -BuildRequires: gettext +BuildRequires: gettext >= 0.16.1 BuildRequires: libpng-devel BuildRequires: libICE-devel BuildRequires: xorg-x11-font-utils @@ -187,16 +187,19 @@ fi %changelog -* Wed Aug 22 2007 Ian Chapman 0.2.25-2 +* Sun Jan 06 2008 Ian Chapman 0.2.26-1 +- Upgrade to 0.2.26 + +* Wed Aug 22 2007 Ian Chapman 0.2.25-2 - Release bump for F8 mass rebuild - License change due to new guidelines - Use fontpath.d for F8+ - Added patch to fix compilation with open() macro on F8+ -* Sun May 27 2007 Ian Chapman 0.2.25-1 +* Sun May 27 2007 Ian Chapman 0.2.25-1 - Upgrade to 0.2.25 -* Tue Mar 13 2007 Ian Chapman 0.2.24-1 +* Tue Mar 13 2007 Ian Chapman 0.2.24-1 - Upgrade to 0.2.24 - Convert README and ChangeLog to UTF-8 - Added patch for x11font to generate more font sizes useful for other @@ -206,8 +209,8 @@ fi - Various other minor changes to the spec - Added xfs support for the fonts -* Fri Sep 01 2006 Ian Chapman 0.2.22-2 +* Fri Sep 01 2006 Ian Chapman 0.2.22-2 - Minor spec cleanups -* Tue Aug 29 2006 Ian Chapman 0.2.22-1 +* Tue Aug 29 2006 Ian Chapman 0.2.22-1 - Initial release From 66dd05067e56af21dbe66c63985c90314c93da56 Mon Sep 17 00:00:00 2001 From: oddsocks Date: Sun, 6 Jan 2008 23:17:39 +0000 Subject: [PATCH 06/64] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- zvbi.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index ed17137..f1390d1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zvbi-0.2.25.tar.bz2 +zvbi-0.2.26.tar.bz2 diff --git a/sources b/sources index 12212b6..5799eee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b63c626baf1fc385df04d88bc9628a4a zvbi-0.2.25.tar.bz2 +82805319ca61f6ffd7b7bb64d7433448 zvbi-0.2.26.tar.bz2 diff --git a/zvbi.spec b/zvbi.spec index 1d45971..f0cc433 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries License: GPLv2+ @@ -187,6 +187,9 @@ fi %changelog +* Sun Jan 06 2008 Ian Chapman 0.2.26-2 +- Release bump + * Sun Jan 06 2008 Ian Chapman 0.2.26-1 - Upgrade to 0.2.26 From 2c1584f4bae48dbe1db1b34b79a0550b71a45efb Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 16:57:54 +0000 Subject: [PATCH 07/64] - Autorebuild for GCC 4.3 --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index f0cc433..735ab67 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries License: GPLv2+ @@ -187,6 +187,9 @@ fi %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 +- Autorebuild for GCC 4.3 + * Sun Jan 06 2008 Ian Chapman 0.2.26-2 - Release bump From 2d5c2cf9d461d8d0b7651ca0586ec5a0f0e84a31 Mon Sep 17 00:00:00 2001 From: oddsocks Date: Wed, 5 Mar 2008 23:11:11 +0000 Subject: [PATCH 08/64] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- zvbi.spec | 29 ++++++++++++++++------------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.cvsignore b/.cvsignore index f1390d1..bc0c205 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zvbi-0.2.26.tar.bz2 +zvbi-0.2.30.tar.bz2 diff --git a/sources b/sources index 5799eee..e9f0e45 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82805319ca61f6ffd7b7bb64d7433448 zvbi-0.2.26.tar.bz2 +ab131c42115188e131def8f5364e4491 zvbi-0.2.30.tar.bz2 diff --git a/zvbi.spec b/zvbi.spec index 735ab67..cc495c2 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,15 +2,16 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.26 -Release: 3%{?dist} +Version: 0.2.30 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries -License: GPLv2+ +# See NEWS for a full breakdown of licensing. +License: LGPLv2+ and GPLv2+ and BSD URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 -Patch0: zvbi-0.2.24-tvfonts.patch -Patch1: zvbi-0.2.25-openfix.patch +Patch0: %{name}-0.2.24-tvfonts.patch +Patch1: %{name}-0.2.25-openfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig @@ -65,10 +66,7 @@ Fonts from zvbi converted for use with X11 %patch -p1 -b .orig %patch1 -p1 -#Fix character encodings (note ChangeLog's encoding is broken, hence sed) -sed -i 's/\xC3\xB2/\xF2/g' ChangeLog -sed -i 's/\xC2\x81//g' ChangeLog -iconv -f iso8859-1 ChangeLog -t utf8 > ChangeLog.conv && /bin/mv -f ChangeLog.conv ChangeLog +#Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README @@ -103,11 +101,11 @@ make install DESTDIR=%{buildroot} %find_lang %{name} #Install init script -install -m0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid +install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid #Install fonts -install -m 0644 contrib/*.pcf.gz %{buildroot}%{fontdir} -install -m 0644 contrib/fonts.* %{buildroot}%{fontdir} +install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir} +install -pm0644 contrib/fonts.* %{buildroot}%{fontdir} #%%ghost the fonts.cache-1 and fonts.dir touch %{buildroot}%{fontdir}/fonts.cache-1 @@ -166,7 +164,7 @@ fi %{_mandir}/man1/* %exclude %{_libdir}/*.a %exclude %{_libdir}/*.la -%doc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING NEWS README TODO +%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO %files devel @@ -187,6 +185,11 @@ fi %changelog +* Wed Mar 05 2008 Ian Chapman 0.2.30-1 +- Update to 0.2.30 +- Updated license field due to license change GPLv2+ -> LGPLv2+ +- Dropped encoding fixes for ChangeLog. No longer needed. + * Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 - Autorebuild for GCC 4.3 From b014d92519456318ae189ae45ec8711825a73e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 21 Sep 2008 09:10:19 +0000 Subject: [PATCH 09/64] - Fix Patch0:/%patch mismatch. https://www.redhat.com/archives/fedora-devel-list/2008-September/msg00375.h tml --- zvbi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index cc495c2..3ea280e 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.30 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -63,7 +63,7 @@ Fonts from zvbi converted for use with X11 %prep %setup -q -%patch -p1 -b .orig +%patch0 -p1 -b .orig %patch1 -p1 #Fix character encodings @@ -185,6 +185,9 @@ fi %changelog +* Sun Sep 21 2008 Ville Skyttä - 0.2.30-2 +- Fix Patch0:/%%patch mismatch. + * Wed Mar 05 2008 Ian Chapman 0.2.30-1 - Update to 0.2.30 - Updated license field due to license change GPLv2+ -> LGPLv2+ From db7f7451445a409a73811df54295ae7f70add66f Mon Sep 17 00:00:00 2001 From: Subhodip Biswas Date: Fri, 14 Nov 2008 18:23:42 +0000 Subject: [PATCH 10/64] Package Updated to 0.2.33 --- .cvsignore | 2 +- sources | 2 +- zvbi.spec | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index bc0c205..a86439d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zvbi-0.2.30.tar.bz2 +zvbi-0.2.33.tar.bz2 diff --git a/sources b/sources index e9f0e45..1d95bc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab131c42115188e131def8f5364e4491 zvbi-0.2.30.tar.bz2 +1741a6045c3eedfb611d645f2da69ac8 zvbi-0.2.33.tar.bz2 diff --git a/zvbi.spec b/zvbi.spec index 3ea280e..c1e0679 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,8 +2,8 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.30 -Release: 2%{?dist} +Version: 0.2.33 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,8 @@ fi %changelog +* Fri Nov 14 2008 Subhodip Biswas -0.2.33-1 +- Package update . * Sun Sep 21 2008 Ville Skyttä - 0.2.30-2 - Fix Patch0:/%%patch mismatch. From 3eeeea2a6b4659ff849ad0fe424e395900dae89e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:46:41 +0000 Subject: [PATCH 11/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index c1e0679..8450f8d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Nov 14 2008 Subhodip Biswas -0.2.33-1 - Package update . * Sun Sep 21 2008 Ville Skyttä - 0.2.30-2 From c62298d66f4d6aef0bca931b7580506294872476 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Wed, 25 Mar 2009 15:57:27 +0000 Subject: [PATCH 12/64] *** empty log message *** --- zvbi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 8450f8d..38b98a1 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,10 +185,13 @@ fi %changelog +* Wed Mar 25 2009 Dmitry Butskoy - 0.2.33-3 +- Rebuilt for #491975 + * Wed Feb 25 2009 Fedora Release Engineering - 0.2.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Fri Nov 14 2008 Subhodip Biswas -0.2.33-1 +* Fri Nov 14 2008 Subhodip Biswas - 0.2.33-1 - Package update . * Sun Sep 21 2008 Ville Skyttä - 0.2.30-2 - Fix Patch0:/%%patch mismatch. From a0175368dd7cf761b91a4be3a5a56302fc28d0e2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 09:05:09 +0000 Subject: [PATCH 13/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 38b98a1..2be9a61 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.2.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Wed Mar 25 2009 Dmitry Butskoy - 0.2.33-3 - Rebuilt for #491975 From e00cf908b5e68291f75704d0f9de0dbef75f680f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:39:21 +0000 Subject: [PATCH 14/64] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1cd9b80..20c4648 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zvbi -# $Id$ +# $Id: Makefile,v 1.1 2006/09/07 21:11:23 oddsocks Exp $ NAME := zvbi 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 +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)) From 8f00f54ddfc2b030c1ed17896af209e86b67c913 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Sun, 21 Feb 2010 15:12:23 +0000 Subject: [PATCH 15/64] *** empty log message *** --- zvbi.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 2be9a61..51e6959 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -12,6 +12,7 @@ URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch +Patch2: %{name}-0.2.33-stat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig @@ -54,6 +55,9 @@ Requires(postun): fontconfig Requires(post): chkfontpath Requires(postun): chkfontpath %endif +%if 0%{?fedora? > 9 +BuildArch: noarch +%endif Obsoletes: xawtv-tv-fonts < 3.95 Provides: xawtv-tv-fonts >= 3.95 @@ -63,8 +67,9 @@ Fonts from zvbi converted for use with X11 %prep %setup -q -%patch0 -p1 -b .orig +%patch0 -p1 %patch1 -p1 +%patch1 -p2 #Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README @@ -185,6 +190,10 @@ fi %changelog +* Sun Feb 21 2010 Dmitry Butskoy - 0.2.33-5 +- add patch to fix compiling under rawhide (#564991) +- make fonts subpackage arch independent + * Mon Jul 27 2009 Fedora Release Engineering - 0.2.33-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 4c8e258f3391db15c57c694251610ec8a3a92554 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Sun, 21 Feb 2010 15:13:32 +0000 Subject: [PATCH 16/64] *** empty log message *** --- zvbi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 51e6959..a04116a 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -55,7 +55,7 @@ Requires(postun): fontconfig Requires(post): chkfontpath Requires(postun): chkfontpath %endif -%if 0%{?fedora? > 9 +%if 0%{?fedora} > 9 BuildArch: noarch %endif Obsoletes: xawtv-tv-fonts < 3.95 From 8d37d2245466e7ac8ff97c96c7af8ba11660afad Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Sun, 21 Feb 2010 15:30:16 +0000 Subject: [PATCH 17/64] *** empty log message *** --- zvbi-0.2.33-stat.patch | 33 +++++++++++++++++++++++++++++++++ zvbi.spec | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 zvbi-0.2.33-stat.patch diff --git a/zvbi-0.2.33-stat.patch b/zvbi-0.2.33-stat.patch new file mode 100644 index 0000000..e06381e --- /dev/null +++ b/zvbi-0.2.33-stat.patch @@ -0,0 +1,33 @@ +diff -Nrbu zvbi-0.2.33/contrib/ntsc-cc.c zvbi-0.2.33-OK/contrib/ntsc-cc.c +--- zvbi-0.2.33/contrib/ntsc-cc.c 2007-11-27 20:39:34.000000000 +0300 ++++ zvbi-0.2.33-OK/contrib/ntsc-cc.c 2010-02-21 17:57:17.000000000 +0300 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -Nrbu zvbi-0.2.33/src/io-dvb.c zvbi-0.2.33-OK/src/io-dvb.c +--- zvbi-0.2.33/src/io-dvb.c 2008-02-24 17:18:21.000000000 +0300 ++++ zvbi-0.2.33-OK/src/io-dvb.c 2010-02-21 17:57:32.000000000 +0300 +@@ -27,6 +27,7 @@ + + #include /* read() */ + #include ++#include + #include + #include + +diff -Nrbu zvbi-0.2.33/src/io-v4l.c zvbi-0.2.33-OK/src/io-v4l.c +--- zvbi-0.2.33/src/io-v4l.c 2008-02-24 17:17:28.000000000 +0300 ++++ zvbi-0.2.33-OK/src/io-v4l.c 2010-02-21 17:57:47.000000000 +0300 +@@ -40,6 +40,7 @@ + #include + #include /* read(), dup2(), getuid() */ + #include ++#include + #include /* timeval */ + #include /* fd_set, uid_t */ + #include /* for (_)videodev.h */ diff --git a/zvbi.spec b/zvbi.spec index a04116a..fb8aac2 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -69,7 +69,7 @@ Fonts from zvbi converted for use with X11 %setup -q %patch0 -p1 %patch1 -p1 -%patch1 -p2 +%patch2 -p1 #Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README From 4aad2a915e3e1875b824f375b54167ab7b85cdb9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:33:31 +0000 Subject: [PATCH 18/64] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 20c4648..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zvbi -# $Id: Makefile,v 1.1 2006/09/07 21:11:23 oddsocks Exp $ -NAME := zvbi -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) From 38a40e1b055774db7d0c676a8f3b65c02cea7c2a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 03:19:15 -0600 Subject: [PATCH 19/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index fb8aac2..d1bb69d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -190,6 +190,9 @@ fi %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.33-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Feb 21 2010 Dmitry Butskoy - 0.2.33-5 - add patch to fix compiling under rawhide (#564991) - make fonts subpackage arch independent From c7f8a5282a1e972d91b61a9074d729d7d4c8982b Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Wed, 17 Aug 2011 17:33:38 +0400 Subject: [PATCH 20/64] Migration to Systemd --- zvbi.spec | 56 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 43 insertions(+), 13 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index d1bb69d..7f76a27 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -20,10 +20,12 @@ BuildRequires: gettext >= 0.16.1 BuildRequires: libpng-devel BuildRequires: libICE-devel BuildRequires: xorg-x11-font-utils -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + %description ZVBI provides functions to capture and decode VBI data. The vertical blanking @@ -74,6 +76,21 @@ Fonts from zvbi converted for use with X11 #Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README +# systemd service file +cat >zvbid.service </dev/null 2>&1 || : +fi %postun /sbin/ldconfig -if [ "$1" -ge "1" ]; then - /sbin/service zvbid condrestart >/dev/null 2>&1 || : + +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 != 0 ]; then + /bin/systemctl try-restart zvbid.service >/dev/null 2>&1 || : fi %preun + if [ $1 = 0 ]; then - /sbin/service zvbid stop >/dev/null 2>&1 || : - /sbin/chkconfig --del zvbid + /bin/systemctl --no-reload disable zvbid.service >/dev/null 2>&1 || : + /bin/systemctl stop zvbid.service >/dev/null 2>&1 || : fi @@ -164,7 +190,8 @@ fi %defattr(-,root,root,-) %{_bindir}/%{name}* %{_sbindir}/zvbid -%{_sysconfdir}/rc.d/init.d/zvbid +#%{_initrddir}/zvbid +%{_unitdir}/zvbid.service %{_libdir}/*.so.* %{_mandir}/man1/* %exclude %{_libdir}/*.a @@ -190,6 +217,9 @@ fi %changelog +* Wed Aug 17 2011 Dmitry Butskoy - 0.2.33-7 +- Migration from SysV to Systemd init system (#730154) + * Tue Feb 08 2011 Fedora Release Engineering - 0.2.33-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 4e098167e5d850ff41b12f550bbe56e5efd12b6d Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Wed, 17 Aug 2011 17:52:34 +0400 Subject: [PATCH 21/64] fix typo --- zvbi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 7f76a27..34242b6 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -125,7 +125,7 @@ make install DESTDIR=%{buildroot} #mkdir -p %{buildroot}%{_initrddir} #install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid mkdir -p %{buildroot}%{_unitdir} -install -m644 zvbid.services %{buildroot}%{_unitdir} +install -m644 zvbid.service %{buildroot}%{_unitdir} rm -rf %{buildroot}%{_initrddir} #Install fonts From 01b147cfff46997164ebdad3ee351124285b816c Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Tue, 6 Sep 2011 17:34:12 +0400 Subject: [PATCH 22/64] Drop chkconfig completely --- zvbi.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 34242b6..15431ba 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -53,13 +53,7 @@ Group: User Interface/X Requires(post): fontconfig Requires(postun): fontconfig # Don't use chkfontpath for F8+, it's legacy. -%if 0%{?fedora} <= 7 -Requires(post): chkfontpath -Requires(postun): chkfontpath -%endif -%if 0%{?fedora} > 9 BuildArch: noarch -%endif Obsoletes: xawtv-tv-fonts < 3.95 Provides: xawtv-tv-fonts >= 3.95 @@ -135,10 +129,8 @@ install -pm0644 contrib/fonts.* %{buildroot}%{fontdir} #%%ghost the fonts.cache-1 and fonts.dir touch %{buildroot}%{fontdir}/fonts.cache-1 -%if 0%{?fedora} > 7 mkdir -p %{buildroot}%{catalogue} ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} -%endif %clean @@ -172,17 +164,11 @@ fi %post fonts fc-cache -f %{_datadir}/fonts/%{name} || : -%if 0%{?fedora} <= 7 -chkfontpath -q -a %{fontdir} || : -%endif %postun fonts if [ "$1" = "0" ]; then fc-cache -f %{_datadir}/fonts || : -%if 0%{?fedora} <= 7 - chkfontpath -q -r %{fontdir} || : -%endif fi @@ -210,13 +196,14 @@ fi %{fontdir}/*.gz %{fontdir}/fonts.dir %{fontdir}/fonts.alias -%if 0%{?fedora} > 7 %{catalogue}/%{name} -%endif %ghost %{fontdir}/fonts.cache-1 %changelog +* Tue Sep 6 2011 Dmitry Butskoy - 0.2.33-8 +- Drop chkconfig stuff completely + * Wed Aug 17 2011 Dmitry Butskoy - 0.2.33-7 - Migration from SysV to Systemd init system (#730154) From 922b209a51e456aa2a4b633ab06f0cf27760b6bd Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Fri, 23 Sep 2011 15:28:46 -0400 Subject: [PATCH 23/64] add missing triggerun for systemd migration --- zvbi.spec | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 15431ba..4c63be9 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -13,7 +13,6 @@ Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}. Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch Patch2: %{name}-0.2.33-stat.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: fontconfig BuildRequires: gettext >= 0.16.1 @@ -22,6 +21,7 @@ BuildRequires: libICE-devel BuildRequires: xorg-x11-font-utils BuildRequires: systemd-units +Requires(post): systemd-sysv Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -108,7 +108,6 @@ popd %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{fontdir} make install DESTDIR=%{buildroot} @@ -133,10 +132,6 @@ mkdir -p %{buildroot}%{catalogue} ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} -%clean -rm -rf %{buildroot} - - %post /sbin/ldconfig @@ -161,6 +156,17 @@ if [ $1 = 0 ]; then /bin/systemctl stop zvbid.service >/dev/null 2>&1 || : fi +%triggerun -- zvbi < 0.2.33-9 +# Save the current service runlevel info +# User must manually run systemd-sysv-convert --apply zvbid +# to migrate them to systemd targets +/usr/bin/systemd-sysv-convert --save zvbid >/dev/null 2>&1 ||: + +# Run these because the SysV package being removed won't do them +/sbin/chkconfig --del zvbid >/dev/null 2>&1 || : +/bin/systemctl try-restart zvbid.service >/dev/null 2>&1 || : + + %post fonts fc-cache -f %{_datadir}/fonts/%{name} || : @@ -173,7 +179,6 @@ fi %files -f %{name}.lang -%defattr(-,root,root,-) %{_bindir}/%{name}* %{_sbindir}/zvbid #%{_initrddir}/zvbid @@ -201,6 +206,9 @@ fi %changelog +* Fri Sep 23 2011 Tom Callaway - 0.2.33-9 +- add missing triggerun for systemd migration + * Tue Sep 6 2011 Dmitry Butskoy - 0.2.33-8 - Drop chkconfig stuff completely From 168ca9f85b1de4d5fab4504937fcf0f8e94a2ccc Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:51:12 -0500 Subject: [PATCH 24/64] Rebuild for new libpng --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 4c63be9..b3bad26 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -206,6 +206,9 @@ fi %changelog +* Tue Dec 06 2011 Adam Jackson - 0.2.33-10 +- Rebuild for new libpng + * Fri Sep 23 2011 Tom Callaway - 0.2.33-9 - add missing triggerun for systemd migration From 93650a589ca291c31336d5bf8c5ab907db1fb5d3 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 6 Dec 2011 13:43:54 +0100 Subject: [PATCH 25/64] Fix build with libpng-1.5 --- zvbi-0.2.33-libpng15.patch | 17 +++++++++++++++++ zvbi.spec | 7 ++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 zvbi-0.2.33-libpng15.patch diff --git a/zvbi-0.2.33-libpng15.patch b/zvbi-0.2.33-libpng15.patch new file mode 100644 index 0000000..4eeae5b --- /dev/null +++ b/zvbi-0.2.33-libpng15.patch @@ -0,0 +1,17 @@ +diff -up zvbi-0.2.33/src/exp-gfx.c~ zvbi-0.2.33/src/exp-gfx.c +--- zvbi-0.2.33/src/exp-gfx.c~ 2008-02-24 15:17:47.000000000 +0100 ++++ zvbi-0.2.33/src/exp-gfx.c 2011-12-06 13:40:25.218139962 +0100 +@@ -1672,11 +1672,11 @@ write_png (gfx_instance * gfx, + char title[80]; + unsigned int i; + +- if (setjmp (png_ptr->jmpbuf)) ++ if (png_jmpbuf (png_ptr)) + return FALSE; + + png_set_write_fn (png_ptr, +- (voidp) gfx, ++ gfx, + write_data, + flush_data); + diff --git a/zvbi.spec b/zvbi.spec index b3bad26..77ef844 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -13,6 +13,7 @@ Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}. Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch Patch2: %{name}-0.2.33-stat.patch +Patch3: %{name}-0.2.33-libpng15.patch BuildRequires: doxygen BuildRequires: fontconfig BuildRequires: gettext >= 0.16.1 @@ -66,6 +67,7 @@ Fonts from zvbi converted for use with X11 %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 #Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README @@ -206,6 +208,9 @@ fi %changelog +* Tue Dec 06 2011 Hans de Goede - 0.2.33-11 +- Fix build with libpng-1.5 + * Tue Dec 06 2011 Adam Jackson - 0.2.33-10 - Rebuild for new libpng From 6fa91b0a6342df30dcbf4469ecf9224dd224d5dc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:39:52 -0600 Subject: [PATCH 26/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 77ef844..c1147f3 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -208,6 +208,9 @@ fi %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.2.33-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Hans de Goede - 0.2.33-11 - Fix build with libpng-1.5 From dca39411ffaa048784a20fe36ea836011b9d4a8d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 03:36:09 -0500 Subject: [PATCH 27/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index c1147f3..ce37927 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -208,6 +208,9 @@ fi %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.2.33-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.2.33-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From f7a6f76965bd7d54aee75fe3ea975af5c976de17 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Mon, 24 Sep 2012 18:16:21 +0400 Subject: [PATCH 28/64] new systemd-rpm macros drop sysv migration stuff --- zvbi.spec | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index ce37927..ab55739 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -22,7 +22,6 @@ BuildRequires: libICE-devel BuildRequires: xorg-x11-font-utils BuildRequires: systemd-units -Requires(post): systemd-sysv Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -136,38 +135,16 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %post /sbin/ldconfig - -if [ $1 = 1 ]; then - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -fi - - -%postun -/sbin/ldconfig - -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 != 0 ]; then - /bin/systemctl try-restart zvbid.service >/dev/null 2>&1 || : -fi +%systemd_post zvbid.service %preun +%systemd_preun zvbid.service -if [ $1 = 0 ]; then - /bin/systemctl --no-reload disable zvbid.service >/dev/null 2>&1 || : - /bin/systemctl stop zvbid.service >/dev/null 2>&1 || : -fi - -%triggerun -- zvbi < 0.2.33-9 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply zvbid -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save zvbid >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del zvbid >/dev/null 2>&1 || : -/bin/systemctl try-restart zvbid.service >/dev/null 2>&1 || : +%postun +/sbin/ldconfig +%systemd_postun_with_restart zvbid.service %post fonts @@ -208,6 +185,10 @@ fi %changelog +* Mon Sep 24 2012 Dmitry Butskoy - 0.2.33-14 +- new systemd-rpm macros (#850382) +- drop sysv triggerun migration + * Sun Jul 22 2012 Fedora Release Engineering - 0.2.33-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 70adb3eaad32210e6ae29c3c48abcc4854a4bac0 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 22:25:22 -0600 Subject: [PATCH 29/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index ab55739..8653d28 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.2.33-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Mon Sep 24 2012 Dmitry Butskoy - 0.2.33-14 - new systemd-rpm macros (#850382) - drop sysv triggerun migration From 48dfeaa4a13af320f28fab7097519e6263b252bd Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 05:01:24 -0500 Subject: [PATCH 30/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 8653d28..eb838ac 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 0.2.33-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 0.2.33-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 5dd725eb42f04433c87842fb750c5eeb5045748f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 13:20:09 -0500 Subject: [PATCH 31/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index eb838ac..c1677a1 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.2.33-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 0.2.33-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From a68fa7b6545bc3ba507fc37c6f4b7532357de123 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:49:57 +0000 Subject: [PATCH 32/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index c1677a1..5ab3883 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 0.2.33-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.2.33-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 92cbd856da1c977b9a661f237b22e2588bf5e6b4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:51:13 +0000 Subject: [PATCH 33/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 5ab3883..900ea7f 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.2.33-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 0.2.33-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 96bb480000a97f6317eb4daa2bc85c7dbba91d2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 04:09:24 +0000 Subject: [PATCH 34/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 900ea7f..ed05efa 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.33 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -185,6 +185,9 @@ fi %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.2.33-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 0.2.33-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 5327124c9654a1314ba3c59f04b907b7bfd3b1c9 Mon Sep 17 00:00:00 2001 From: buc Date: Sun, 14 Feb 2016 20:23:48 +0300 Subject: [PATCH 35/64] Update to 0.2.35 --- sources | 2 +- zvbi-0.2.33-libpng15.patch | 17 ----------------- zvbi-0.2.33-stat.patch | 33 --------------------------------- zvbi.spec | 25 ++++++++----------------- 4 files changed, 9 insertions(+), 68 deletions(-) delete mode 100644 zvbi-0.2.33-libpng15.patch delete mode 100644 zvbi-0.2.33-stat.patch diff --git a/sources b/sources index 1d95bc4..c88e027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1741a6045c3eedfb611d645f2da69ac8 zvbi-0.2.33.tar.bz2 +95e53eb208c65ba6667fd4341455fa27 zvbi-0.2.35.tar.bz2 diff --git a/zvbi-0.2.33-libpng15.patch b/zvbi-0.2.33-libpng15.patch deleted file mode 100644 index 4eeae5b..0000000 --- a/zvbi-0.2.33-libpng15.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up zvbi-0.2.33/src/exp-gfx.c~ zvbi-0.2.33/src/exp-gfx.c ---- zvbi-0.2.33/src/exp-gfx.c~ 2008-02-24 15:17:47.000000000 +0100 -+++ zvbi-0.2.33/src/exp-gfx.c 2011-12-06 13:40:25.218139962 +0100 -@@ -1672,11 +1672,11 @@ write_png (gfx_instance * gfx, - char title[80]; - unsigned int i; - -- if (setjmp (png_ptr->jmpbuf)) -+ if (png_jmpbuf (png_ptr)) - return FALSE; - - png_set_write_fn (png_ptr, -- (voidp) gfx, -+ gfx, - write_data, - flush_data); - diff --git a/zvbi-0.2.33-stat.patch b/zvbi-0.2.33-stat.patch deleted file mode 100644 index e06381e..0000000 --- a/zvbi-0.2.33-stat.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nrbu zvbi-0.2.33/contrib/ntsc-cc.c zvbi-0.2.33-OK/contrib/ntsc-cc.c ---- zvbi-0.2.33/contrib/ntsc-cc.c 2007-11-27 20:39:34.000000000 +0300 -+++ zvbi-0.2.33-OK/contrib/ntsc-cc.c 2010-02-21 17:57:17.000000000 +0300 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff -Nrbu zvbi-0.2.33/src/io-dvb.c zvbi-0.2.33-OK/src/io-dvb.c ---- zvbi-0.2.33/src/io-dvb.c 2008-02-24 17:18:21.000000000 +0300 -+++ zvbi-0.2.33-OK/src/io-dvb.c 2010-02-21 17:57:32.000000000 +0300 -@@ -27,6 +27,7 @@ - - #include /* read() */ - #include -+#include - #include - #include - -diff -Nrbu zvbi-0.2.33/src/io-v4l.c zvbi-0.2.33-OK/src/io-v4l.c ---- zvbi-0.2.33/src/io-v4l.c 2008-02-24 17:17:28.000000000 +0300 -+++ zvbi-0.2.33-OK/src/io-v4l.c 2010-02-21 17:57:47.000000000 +0300 -@@ -40,6 +40,7 @@ - #include - #include /* read(), dup2(), getuid() */ - #include -+#include - #include /* timeval */ - #include /* fd_set, uid_t */ - #include /* for (_)videodev.h */ diff --git a/zvbi.spec b/zvbi.spec index ed05efa..c24a3a5 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,8 +2,8 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.33 -Release: 20%{?dist} +Version: 0.2.35 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -12,8 +12,7 @@ URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch -Patch2: %{name}-0.2.33-stat.patch -Patch3: %{name}-0.2.33-libpng15.patch + BuildRequires: doxygen BuildRequires: fontconfig BuildRequires: gettext >= 0.16.1 @@ -52,7 +51,6 @@ Summary: Fonts from zvbi converted to X11 Group: User Interface/X Requires(post): fontconfig Requires(postun): fontconfig -# Don't use chkfontpath for F8+, it's legacy. BuildArch: noarch Obsoletes: xawtv-tv-fonts < 3.95 Provides: xawtv-tv-fonts >= 3.95 @@ -65,10 +63,8 @@ Fonts from zvbi converted for use with X11 %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -#Fix character encodings +# Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README # systemd service file @@ -94,7 +90,7 @@ EOF %configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy make %{?_smp_mflags} -#Generate fonts, fonts.alias and fonts.dir +# Generate fonts, fonts.alias and fonts.dir pushd contrib ./x11font for font in *.bdf @@ -112,21 +108,14 @@ popd mkdir -p %{buildroot}%{fontdir} make install DESTDIR=%{buildroot} -#Find locales %find_lang %{name} -#Install init script -#mkdir -p %{buildroot}%{_initrddir} -#install -pm0755 daemon/zvbid.init %{buildroot}%{_sysconfdir}/rc.d/init.d/zvbid mkdir -p %{buildroot}%{_unitdir} install -m644 zvbid.service %{buildroot}%{_unitdir} rm -rf %{buildroot}%{_initrddir} -#Install fonts install -pm0644 contrib/*.pcf.gz %{buildroot}%{fontdir} install -pm0644 contrib/fonts.* %{buildroot}%{fontdir} - -#%%ghost the fonts.cache-1 and fonts.dir touch %{buildroot}%{fontdir}/fonts.cache-1 mkdir -p %{buildroot}%{catalogue} @@ -160,7 +149,6 @@ fi %files -f %{name}.lang %{_bindir}/%{name}* %{_sbindir}/zvbid -#%{_initrddir}/zvbid %{_unitdir}/zvbid.service %{_libdir}/*.so.* %{_mandir}/man1/* @@ -185,6 +173,9 @@ fi %changelog +* Sun Feb 14 2016 Dmitry Butskoy - 0.2.35-1 +- Update to 0.2.35 + * Fri Feb 05 2016 Fedora Release Engineering - 0.2.33-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From de41c24f58ff3d384867da730966b3356f497b32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:27:36 +0000 Subject: [PATCH 36/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index c24a3a5..78cda2c 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -173,6 +173,9 @@ fi %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.2.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sun Feb 14 2016 Dmitry Butskoy - 0.2.35-1 - Update to 0.2.35 From c0e4501f0ad1c65e2a895fee959a5db7720225f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:46:49 +0000 Subject: [PATCH 37/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 78cda2c..781f164 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -173,6 +173,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.2.35-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.2.35-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From c0e308486489f1a3b043de1a8d23d473bc1aeda9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:14:09 +0000 Subject: [PATCH 38/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 781f164..147cec8 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -173,6 +173,9 @@ fi %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 0.2.35-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.2.35-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a715ceae31e37137ee7e076a2dda8720a56c1d41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:33:07 +0000 Subject: [PATCH 39/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 147cec8..1ad045a 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -173,6 +173,9 @@ fi %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.2.35-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 0.2.35-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From b14d91a38456713aa3f2cec7742bba551e841db9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 40/64] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- zvbi.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zvbi.spec b/zvbi.spec index 1ad045a..bac7147 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -13,6 +13,7 @@ Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}. Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch +BuildRequires: gcc BuildRequires: doxygen BuildRequires: fontconfig BuildRequires: gettext >= 0.16.1 From 8150abca3b8eeeba687777a2620448b711056e6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:53:53 +0000 Subject: [PATCH 41/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index bac7147..d3f5755 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. @@ -174,6 +174,9 @@ fi %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.2.35-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.2.35-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 86db1286f470a8d39e8fda417e7b93411191701d Mon Sep 17 00:00:00 2001 From: buc Date: Mon, 16 Jul 2018 22:57:38 +0300 Subject: [PATCH 42/64] BR: gcc-c++ --- zvbi.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index d3f5755..8942975 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -13,7 +13,7 @@ Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}. Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: fontconfig BuildRequires: gettext >= 0.16.1 From ddb4cfbcd0de12bb5659f29169ea70c65c5a14d7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 43/64] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- zvbi.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 8942975..2836b02 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -5,7 +5,6 @@ Name: zvbi Version: 0.2.35 Release: 6%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library -Group: System Environment/Libraries # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD URL: http://zapping.sourceforge.net/ZVBI/index.html @@ -39,7 +38,6 @@ other digital data can be sent during this time period. %package devel Summary: Development files for zvbi -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig @@ -49,7 +47,6 @@ Development files for zvbi %package fonts Summary: Fonts from zvbi converted to X11 -Group: User Interface/X Requires(post): fontconfig Requires(postun): fontconfig BuildArch: noarch From facb41879685b64cc1ec451594d5a55d83675203 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:15:55 +0000 Subject: [PATCH 44/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 2836b02..e1c942c 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -171,6 +171,9 @@ fi %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.2.35-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.2.35-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9e151cd01572f6e126f6f78c260058ce8a3683ab Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 12 Feb 2019 12:36:38 +0100 Subject: [PATCH 45/64] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- zvbi.spec | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index e1c942c..2c8f117 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -38,8 +38,7 @@ other digital data can be sent during this time period. %package devel Summary: Development files for zvbi -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for zvbi @@ -47,8 +46,6 @@ Development files for zvbi %package fonts Summary: Fonts from zvbi converted to X11 -Requires(post): fontconfig -Requires(postun): fontconfig BuildArch: noarch Obsoletes: xawtv-tv-fonts < 3.95 Provides: xawtv-tv-fonts >= 3.95 @@ -121,7 +118,6 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %post -/sbin/ldconfig %systemd_post zvbid.service @@ -130,20 +126,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %postun -/sbin/ldconfig %systemd_postun_with_restart zvbid.service -%post fonts -fc-cache -f %{_datadir}/fonts/%{name} || : - - -%postun fonts -if [ "$1" = "0" ]; then - fc-cache -f %{_datadir}/fonts || : -fi - - %files -f %{name}.lang %{_bindir}/%{name}* %{_sbindir}/zvbid @@ -171,6 +156,9 @@ fi %changelog +* Tue Feb 12 2019 Igor Gnatenko - 0.2.35-8 +- Remove obsolete scriptlets + * Sun Feb 03 2019 Fedora Release Engineering - 0.2.35-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dba2dd6329c1180ce277b8ea155a20f77232911a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:05:57 +0000 Subject: [PATCH 46/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 2c8f117..98138fc 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -156,6 +156,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.2.35-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 12 2019 Igor Gnatenko - 0.2.35-8 - Remove obsolete scriptlets From c7c123b50b489f65a58d3d05b0f4e3a1787e13ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:24:46 +0000 Subject: [PATCH 47/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 98138fc..8f1cc31 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -156,6 +156,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.2.35-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.2.35-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 1eacb76059f082933f0219fa7aa787cd4a7c0a59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:28:31 +0000 Subject: [PATCH 48/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 8f1cc31..f453306 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -156,6 +156,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.2.35-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 0.2.35-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 046e3cffc057c5a0a3ddaab13c25f5d61736f761 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:56:41 +0000 Subject: [PATCH 49/64] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- zvbi.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zvbi.spec b/zvbi.spec index f453306..e30ab9d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -12,6 +12,7 @@ Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}. Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: fontconfig From 80569d33723948bd8e8944fea46799cb435daa5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:46:59 +0000 Subject: [PATCH 50/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index e30ab9d..b2da906 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -157,6 +157,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.2.35-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.2.35-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8bd2c03756583c69600f532f17769625f366915c Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Mon, 1 Mar 2021 20:13:10 +0300 Subject: [PATCH 51/64] Fix BuildRequires (#1933652) --- zvbi.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index b2da906..658d5ec 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -19,7 +19,8 @@ BuildRequires: fontconfig BuildRequires: gettext >= 0.16.1 BuildRequires: libpng-devel BuildRequires: libICE-devel -BuildRequires: xorg-x11-font-utils +BuildRequires: bdftopcf +BuildRequires: mkfontdir BuildRequires: systemd-units Requires(post): systemd-units @@ -157,6 +158,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Mon Mar 1 2021 Dmitry Butskoy - 0.2.35-13 +- Fix BuildRequires (#1933652) + * Thu Jan 28 2021 Fedora Release Engineering - 0.2.35-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 52443b53314debd443e0193071d3cfac37072e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:11:59 +0100 Subject: [PATCH 52/64] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- zvbi.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 658d5ec..d06ab99 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -158,6 +158,10 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.2.35-14 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Mon Mar 1 2021 Dmitry Butskoy - 0.2.35-13 - Fix BuildRequires (#1933652) From d6b2c0387d1c2829bae9465ae8b5ecee58f27985 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:23:59 +0000 Subject: [PATCH 53/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index d06ab99..854d279 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -158,6 +158,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.2.35-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.2.35-14 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. From 291cc7aa62a4efed56866ab4bc1826061b60b215 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Sun, 25 Jul 2021 01:47:01 +0300 Subject: [PATCH 54/64] avoid rpath in binaries --- zvbi.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zvbi.spec b/zvbi.spec index 854d279..995ed78 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -85,6 +85,10 @@ EOF # x11font during compile time to convert zvbi fonts into x11 fonts. x11font # is thrown away and not installed as it's not useful for anything else %configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy + +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} # Generate fonts, fonts.alias and fonts.dir @@ -160,6 +164,7 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog * Fri Jul 23 2021 Fedora Release Engineering - 0.2.35-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +- avoid rpath in binaries * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.2.35-14 - Rebuilt for updated systemd-rpm-macros From 3d972b4827acc75397a76d7ce892d40c0c2e6ff0 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Tue, 14 Dec 2021 00:21:37 +0300 Subject: [PATCH 55/64] Port to epel9 --- .cvsignore | 0 .gitignore | 1 + Makefile | 21 --- sources | 1 + zvbi-0.2.24-tvfonts.patch | 128 ++++++++++++++++ zvbi-0.2.25-openfix.patch | 11 ++ zvbi.spec | 313 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 454 insertions(+), 21 deletions(-) delete mode 100644 .cvsignore create mode 100644 .gitignore delete mode 100644 Makefile create mode 100644 zvbi-0.2.24-tvfonts.patch create mode 100644 zvbi-0.2.25-openfix.patch create mode 100644 zvbi.spec diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a86439d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +zvbi-0.2.33.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 1cd9b80..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zvbi -# $Id$ -NAME := zvbi -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/sources b/sources index e69de29..c88e027 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +95e53eb208c65ba6667fd4341455fa27 zvbi-0.2.35.tar.bz2 diff --git a/zvbi-0.2.24-tvfonts.patch b/zvbi-0.2.24-tvfonts.patch new file mode 100644 index 0000000..8d74388 --- /dev/null +++ b/zvbi-0.2.24-tvfonts.patch @@ -0,0 +1,128 @@ +diff -Nrbu zvbi-0.2.22/contrib/x11font.c zvbi-0.2.22-OK/contrib/x11font.c +--- zvbi-0.2.24/contrib/x11font.c.orig 2006-02-10 09:25:36.000000000 +0300 ++++ zvbi-0.2.24/contrib/x11font.c 2007-03-12 16:55:06.000000000 +0300 +@@ -12,31 +12,31 @@ + { + fprintf(fp, + "STARTFONT 2.1\n" +- "FONT -%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\n" ++ "FONT -%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\n" + "SIZE %d 75 75\n" +- "FONTBOUNDINGBOX 6 13 0 -2\n" ++ "FONTBOUNDINGBOX %d %d 0 0\n" + "STARTPROPERTIES 25\n" + "FONTNAME_REGISTRY \"\"\n" + "FOUNDRY \"%s\"\n" + "FAMILY_NAME \"%s\"\n" +- "WEIGHT_NAME \"medium\"\n" ++ "WEIGHT_NAME \"Medium\"\n" + "SLANT \"%s\"\n" +- "SETWIDTH_NAME \"normal\"\n" ++ "SETWIDTH_NAME \"Normal\"\n" + "ADD_STYLE_NAME \"\"\n" + "PIXEL_SIZE %d\n" + "POINT_SIZE %d\n" + "RESOLUTION_X 75\n" + "RESOLUTION_Y 75\n" +- "SPACING \"c\"\n" ++ "SPACING \"C\"\n" + "AVERAGE_WIDTH %d\n" +- "CHARSET_REGISTRY \"iso10646\"\n" ++ "CHARSET_REGISTRY \"ISO10646\"\n" + "CHARSET_ENCODING \"1\"\n" + "COPYRIGHT \"fixme\"\n" + "CAP_HEIGHT 9\n" + "X_HEIGHT 18\n" +- "FONT \"-%s-%s-medium-%s-normal--%d-%d-75-75-c-%d-iso10646-1\"\n" ++ "FONT \"-%s-%s-Medium-%s-Normal--%d-%d-75-75-C-%d-ISO10646-1\"\n" + "WEIGHT 10\n" +- "RESOLUTION 103\n" ++ "RESOLUTION 75\n" + "QUAD_WIDTH %d\n" + "DEFAULT_CHAR 0\n" + "FONT_ASCENT %d\n" +@@ -44,6 +44,7 @@ + "ENDPROPERTIES\n", + foundry,name,slant,height,height*10,width*10, + height, ++ width,height, + foundry,name,slant,height,height*10,width*10, + foundry,name,slant,height,height*10,width*10, + width,height); +@@ -53,11 +54,11 @@ + print_font(const char *filename, + const char *foundry, + const char *name, int italic, +- uint8_t *font, int cw, int ch, int cpl, ++ uint8_t *font, int cw, int ch, int cpl, int hs, + int count, unsigned int (*map)(unsigned int,int), int invalid) + { + FILE *fp; +- int x,y,i,c,on,bit,byte,mask1,mask2; ++ int x,y,s,i,c,on,bit,byte,mask1,mask2; + + fp = stdout; + if (NULL != filename) { +@@ -67,7 +68,7 @@ + fprintf(stderr,"writing %s\n",filename); + } + +- print_head(fp, foundry, name, italic ? "i" : "r", cw, ch); ++ print_head(fp, foundry, name, italic ? "I" : "R", cw, ch*hs); + fprintf(fp,"CHARS %d\n", count); + + for (i = 0; i < 0xffff; i++) { +@@ -82,8 +83,9 @@ + "BBX %d %d 0 0\n" + "BITMAP\n", + i,cw*10,cw, +- cw,ch); ++ cw,ch*hs); + for (y = 0; y < ch; y++) { ++ for (s = 0; s < hs; s++) { + bit = cpl * cw * y + cw * c; + byte = 0; + for (x = 0; x < cw; x++) { +@@ -100,6 +102,7 @@ + } + fprintf(fp,"%02x\n",byte); + } ++ } + fprintf(fp,"ENDCHAR\n"); + } + fprintf(fp,"ENDFONT\n"); +@@ -109,17 +112,23 @@ + } + + int +-main () ++main(int argc, char *argv[]) + { +- print_font("teletext.bdf","ets","teletext",0,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1448,unicode_wstfont2,357); +- print_font("teletexti.bdf","ets","teletext",1,(uint8_t *) wstfont2_bits, +- TCW,TCH,TCPL,1449,unicode_wstfont2,357); +- print_font("caption.bdf","ets","caption",0,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15); +- print_font("captioni.bdf","ets","caption",1,(uint8_t *) ccfont2_bits, +- CCW,CCH,CCPL,120,unicode_ccfont2,15 + 4 * 32); ++ print_font("teletext1.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,1,1448,unicode_wstfont2,357); ++ print_font("teletext2.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,2,1448,unicode_wstfont2,357); ++ print_font("teletext4.bdf","Ets","Teletext",0,wstfont2_bits, ++ TCW,TCH,TCPL,4,1448,unicode_wstfont2,357); ++ print_font("teletext1i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,1,1449,unicode_wstfont2,357); ++ print_font("teletext2i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,2,1449,unicode_wstfont2,357); ++ print_font("teletext4i.bdf","Ets","Teletext",1,wstfont2_bits, ++ TCW,TCH,TCPL,4,1449,unicode_wstfont2,357); ++ print_font("caption.bdf","Ets","Caption",0,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15); ++ print_font("captioni.bdf","Ets","Caption",1,ccfont2_bits, ++ CCW,CCH,CCPL,1,120,unicode_ccfont2,15 + 4 * 32); + return 0; + } +- +- diff --git a/zvbi-0.2.25-openfix.patch b/zvbi-0.2.25-openfix.patch new file mode 100644 index 0000000..5d8ab6f --- /dev/null +++ b/zvbi-0.2.25-openfix.patch @@ -0,0 +1,11 @@ +--- zvbi-0.2.25/src/chains.c.orig 2007-03-09 05:11:52.000000000 +0000 ++++ zvbi-0.2.25/src/chains.c 2007-08-23 21:29:44.000000000 +0100 +@@ -168,7 +168,7 @@ + return 0; + } + +-int open(const char *pathname, int flags, ...) ++int (open)(const char *pathname, int flags, ...) + { + va_list args; + mode_t mode = 0; diff --git a/zvbi.spec b/zvbi.spec new file mode 100644 index 0000000..995ed78 --- /dev/null +++ b/zvbi.spec @@ -0,0 +1,313 @@ +%define fontdir %{_datadir}/fonts/%{name} +%define catalogue %{_sysconfdir}/X11/fontpath.d + +Name: zvbi +Version: 0.2.35 +Release: 15%{?dist} +Summary: Raw VBI, Teletext and Closed Caption decoding library +# See NEWS for a full breakdown of licensing. +License: LGPLv2+ and GPLv2+ and BSD +URL: http://zapping.sourceforge.net/ZVBI/index.html +Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.2.24-tvfonts.patch +Patch1: %{name}-0.2.25-openfix.patch + +BuildRequires: make +BuildRequires: gcc-c++ +BuildRequires: doxygen +BuildRequires: fontconfig +BuildRequires: gettext >= 0.16.1 +BuildRequires: libpng-devel +BuildRequires: libICE-devel +BuildRequires: bdftopcf +BuildRequires: mkfontdir +BuildRequires: systemd-units + +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units + + +%description +ZVBI provides functions to capture and decode VBI data. The vertical blanking +interval (VBI) is an interval in a television signal that temporarily suspends +transmission of the signal for the electron gun to move back up to the first +line of the television screen to trace the next screen field. The vertical +blanking interval can be used to carry data, since anything sent during the VBI +would naturally not be displayed; various test signals, closed captioning, and +other digital data can be sent during this time period. + + +%package devel +Summary: Development files for zvbi +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for zvbi + + +%package fonts +Summary: Fonts from zvbi converted to X11 +BuildArch: noarch +Obsoletes: xawtv-tv-fonts < 3.95 +Provides: xawtv-tv-fonts >= 3.95 + +%description fonts +Fonts from zvbi converted for use with X11 + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +# Fix character encodings +iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README + +# systemd service file +cat >zvbid.service < ${font%.bdf}.pcf.gz +done +mkfontdir -x .bdf . +cat >fonts.alias < - 0.2.35-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +- avoid rpath in binaries + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 0.2.35-14 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Mon Mar 1 2021 Dmitry Butskoy - 0.2.35-13 +- Fix BuildRequires (#1933652) + +* Thu Jan 28 2021 Fedora Release Engineering - 0.2.35-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.2.35-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.2.35-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.2.35-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Feb 12 2019 Igor Gnatenko - 0.2.35-8 +- Remove obsolete scriptlets + +* Sun Feb 03 2019 Fedora Release Engineering - 0.2.35-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.2.35-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 0.2.35-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.2.35-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.2.35-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.2.35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Feb 14 2016 Dmitry Butskoy - 0.2.35-1 +- Update to 0.2.35 + +* Fri Feb 05 2016 Fedora Release Engineering - 0.2.33-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.2.33-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Aug 18 2014 Fedora Release Engineering - 0.2.33-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.2.33-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.2.33-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 0.2.33-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 24 2012 Dmitry Butskoy - 0.2.33-14 +- new systemd-rpm macros (#850382) +- drop sysv triggerun migration + +* Sun Jul 22 2012 Fedora Release Engineering - 0.2.33-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.2.33-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Hans de Goede - 0.2.33-11 +- Fix build with libpng-1.5 + +* Tue Dec 06 2011 Adam Jackson - 0.2.33-10 +- Rebuild for new libpng + +* Fri Sep 23 2011 Tom Callaway - 0.2.33-9 +- add missing triggerun for systemd migration + +* Tue Sep 6 2011 Dmitry Butskoy - 0.2.33-8 +- Drop chkconfig stuff completely + +* Wed Aug 17 2011 Dmitry Butskoy - 0.2.33-7 +- Migration from SysV to Systemd init system (#730154) + +* Tue Feb 08 2011 Fedora Release Engineering - 0.2.33-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Feb 21 2010 Dmitry Butskoy - 0.2.33-5 +- add patch to fix compiling under rawhide (#564991) +- make fonts subpackage arch independent + +* Mon Jul 27 2009 Fedora Release Engineering - 0.2.33-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Mar 25 2009 Dmitry Butskoy - 0.2.33-3 +- Rebuilt for #491975 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.2.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Nov 14 2008 Subhodip Biswas - 0.2.33-1 +- Package update . +* Sun Sep 21 2008 Ville Skyttä - 0.2.30-2 +- Fix Patch0:/%%patch mismatch. + +* Wed Mar 05 2008 Ian Chapman 0.2.30-1 +- Update to 0.2.30 +- Updated license field due to license change GPLv2+ -> LGPLv2+ +- Dropped encoding fixes for ChangeLog. No longer needed. + +* Tue Feb 19 2008 Fedora Release Engineering - 0.2.26-3 +- Autorebuild for GCC 4.3 + +* Sun Jan 06 2008 Ian Chapman 0.2.26-2 +- Release bump + +* Sun Jan 06 2008 Ian Chapman 0.2.26-1 +- Upgrade to 0.2.26 + +* Wed Aug 22 2007 Ian Chapman 0.2.25-2 +- Release bump for F8 mass rebuild +- License change due to new guidelines +- Use fontpath.d for F8+ +- Added patch to fix compilation with open() macro on F8+ + +* Sun May 27 2007 Ian Chapman 0.2.25-1 +- Upgrade to 0.2.25 + +* Tue Mar 13 2007 Ian Chapman 0.2.24-1 +- Upgrade to 0.2.24 +- Convert README and ChangeLog to UTF-8 +- Added patch for x11font to generate more font sizes useful for other + applications such as xawtv (courtesy of Dmitry Butskoy) +- Fonts sub-rpm now obsoletes and provides xawtv-tv-fonts +- Split font generation and font installation into separate sections +- Various other minor changes to the spec +- Added xfs support for the fonts + +* Fri Sep 01 2006 Ian Chapman 0.2.22-2 +- Minor spec cleanups + +* Tue Aug 29 2006 Ian Chapman 0.2.22-1 +- Initial release From 8ae4fde27c3698cf90c5b676580e61f1e256a640 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:57:49 +0000 Subject: [PATCH 56/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 995ed78..1a4338b 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -162,6 +162,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.2.35-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.2.35-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - avoid rpath in binaries From 43c8c12b233afc3bc276a08bce92375c8d5ec434 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 14:01:54 +0000 Subject: [PATCH 57/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 1a4338b..bc00116 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -162,6 +162,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.2.35-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.2.35-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e2a7bba847ae42a641c9f69013a2590297ddbd0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:22:27 +0000 Subject: [PATCH 58/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index bc00116..7b42a51 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -162,6 +162,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.2.35-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.2.35-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 5add3152085713359693c6fe267b8c3f3cf06465 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 5 Feb 2023 08:36:20 +0100 Subject: [PATCH 59/64] Avoid requiring systemd for systemd rpm scriptlets There is no need to require systemd as systemd correctly handles reloading regardless of the transaction ordering (even if systemd is installed _after_ the package that installs the unit file). This fixes fedora flatpak runtime build where zvbi got added to due to ffmpeg dependency changes. --- zvbi.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 7b42a51..8c14f43 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library # See NEWS for a full breakdown of licensing. License: LGPLv2+ and GPLv2+ and BSD @@ -23,10 +23,6 @@ BuildRequires: bdftopcf BuildRequires: mkfontdir BuildRequires: systemd-units -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units - %description ZVBI provides functions to capture and decode VBI data. The vertical blanking @@ -162,6 +158,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sun Feb 05 2023 Kalev Lember - 0.2.35-19 +- Avoid requiring systemd for systemd rpm scriptlets + * Sat Jan 21 2023 Fedora Release Engineering - 0.2.35-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From eeaf0a4e26236b3e84fc78f94b65071b98e83990 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 17 May 2023 12:25:02 -0400 Subject: [PATCH 60/64] Update License tag to SPDX identifiers; use '%patch -P N' Examine the source and update the License tag to use SPDX expressions. Also change the deprecated %patchN macros to the newer '%patch -P N' style. Signed-off-by: David Cantrell --- zvbi.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/zvbi.spec b/zvbi.spec index 8c14f43..e95f5ac 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,16 +3,15 @@ Name: zvbi Version: 0.2.35 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library -# See NEWS for a full breakdown of licensing. -License: LGPLv2+ and GPLv2+ and BSD +License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT URL: http://zapping.sourceforge.net/ZVBI/index.html Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: doxygen BuildRequires: fontconfig @@ -54,8 +53,8 @@ Fonts from zvbi converted for use with X11 %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 # Fix character encodings iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README @@ -158,6 +157,10 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Wed May 17 2023 David Cantrell - 0.2.35-20 +- Update License tag to use SPDX identifiers +- Change deprecated %%patchN macros to %%patch -P N + * Sun Feb 05 2023 Kalev Lember - 0.2.35-19 - Avoid requiring systemd for systemd rpm scriptlets From 95a871dde95b9273a198a06ef025f10589ba6681 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:48:43 +0000 Subject: [PATCH 61/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index e95f5ac..dec3236 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT URL: http://zapping.sourceforge.net/ZVBI/index.html @@ -157,6 +157,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.2.35-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 17 2023 David Cantrell - 0.2.35-20 - Update License tag to use SPDX identifiers - Change deprecated %%patchN macros to %%patch -P N From b4f09b45e9695c047b34cf982da2fe561612f6d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:20:06 +0000 Subject: [PATCH 62/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index dec3236..e2d944e 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT URL: http://zapping.sourceforge.net/ZVBI/index.html @@ -157,6 +157,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.2.35-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.2.35-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 71ecef088a42963c720c04ecfa5a30096ad9bb46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:58:41 +0000 Subject: [PATCH 63/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index e2d944e..813dfb1 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.35 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT URL: http://zapping.sourceforge.net/ZVBI/index.html @@ -157,6 +157,9 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.2.35-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.2.35-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 580382233d00d1c94305dc5dbd2e68288c474ad9 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Sat, 14 Sep 2024 00:25:31 +0200 Subject: [PATCH 64/64] Update to 0.2.42 --- .gitignore | 1 + sources | 2 +- zvbi-0.2.42-fix_sincos_declaration.patch | 51 ++++++++++++++++++++++ zvbi.spec | 55 +++++++++++++++--------- 4 files changed, 88 insertions(+), 21 deletions(-) create mode 100644 zvbi-0.2.42-fix_sincos_declaration.patch diff --git a/.gitignore b/.gitignore index a86439d..a05bce2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ zvbi-0.2.33.tar.bz2 +/zvbi-0.2.42.tar.gz diff --git a/sources b/sources index c88e027..5d9c577 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95e53eb208c65ba6667fd4341455fa27 zvbi-0.2.35.tar.bz2 +SHA512 (zvbi-0.2.42.tar.gz) = 65ebbab09d0180f62c2016fe3462786a6f89d0ee414f9983d1a89582bff0c17e58fcb8f45690add0314bd3b7d2de86f82e97fd49c93842e0a4f294b2b5508687 diff --git a/zvbi-0.2.42-fix_sincos_declaration.patch b/zvbi-0.2.42-fix_sincos_declaration.patch new file mode 100644 index 0000000..be243e2 --- /dev/null +++ b/zvbi-0.2.42-fix_sincos_declaration.patch @@ -0,0 +1,51 @@ +From 429cf9337588d6e028bd1dc4633953b4eff09597 Mon Sep 17 00:00:00 2001 +From: Ileana Dumitrescu +Date: Wed, 13 Mar 2024 17:42:18 +0200 +Subject: [PATCH] configure.ac: Move sincos function check to AC_CHECK_FUNCS + +--- + configure.ac | 24 +----------------------- + 1 file changed, 1 insertion(+), 23 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ba6f385..476fd69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -89,7 +89,7 @@ AC_CHECK_FUNCS([alarm dup2 gethostbyaddr gethostbyname getopt_long gettimeofday + inet_ntoa localtime_r memmove memset mkdir modf munmap + nl_langinfo putenv select setenv setlocale socket strcasecmp + strchr strdup strerror strncasecmp strndup strrchr strstr +- strtol strtoul tzset strptime getaddrinfo]) ++ strtol strtoul tzset strptime getaddrinfo sincos]) + + AM_CONDITIONAL(HAVE_STRPTIME, [test "x$HAVE_STRPTIME" = xyes]) + +@@ -112,28 +112,6 @@ dnl autoconf 2.71 required additional quotations and usages of "AC_LANG_SOURCE". + dnl "Noteworthy changes in autoconf version 2.66 through 2.68" + dnl + +-dnl sincos() is a GNU extension (a macro, not a function). +-dnl If not present we use a replacement. +-AC_MSG_CHECKING([for sincos]) +-AC_LINK_IFELSE([AC_LANG_SOURCE([ +-#include +-#include +-int main (void) { +-double s, c; +-/* Make sure the compiler does not optimize sincos() away +- so the linker can confirm its availability. */ +-scanf ("%f", &s); +-sincos (s, &s, &c); +-printf ("%f %f", s, c); +-return 0; +-} +-])],[ +- AC_MSG_RESULT([yes]) +- AC_DEFINE(HAVE_SINCOS, 1, [Define if the sincos() function is available]) +-],[ +- AC_MSG_RESULT([no]) +-]) +- + dnl log2() is a GNU extension (a macro, not a function). + dnl If not present we use a replacement. + AC_MSG_CHECKING([for log2]) diff --git a/zvbi.spec b/zvbi.spec index 813dfb1..ccc226d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,25 +2,31 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.35 -Release: 23%{?dist} +Version: 0.2.42 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT -URL: http://zapping.sourceforge.net/ZVBI/index.html -Source0: http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2 +URL: https://github.com/zapping-vbi/zvbi +Source0: https://github.com/zapping-vbi/zvbi/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: %{name}-0.2.24-tvfonts.patch Patch1: %{name}-0.2.25-openfix.patch +# slightly adapted from https://github.com/zapping-vbi/zvbi/commit/ae74ae513714f81b9b8abdb12e1b235d16fad74e.patch +Patch2: zvbi-0.2.42-fix_sincos_declaration.patch -BuildRequires: make -BuildRequires: gcc-c++ +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: bdftopcf BuildRequires: doxygen BuildRequires: fontconfig -BuildRequires: gettext >= 0.16.1 -BuildRequires: libpng-devel +BuildRequires: gcc-c++ +BuildRequires: gettext-devel BuildRequires: libICE-devel -BuildRequires: bdftopcf +BuildRequires: libpng-devel +BuildRequires: libtool +BuildRequires: make BuildRequires: mkfontdir BuildRequires: systemd-units +BuildRequires: tzdata %description @@ -43,7 +49,7 @@ Development files for zvbi %package fonts Summary: Fonts from zvbi converted to X11 -BuildArch: noarch +BuildArch: noarch Obsoletes: xawtv-tv-fonts < 3.95 Provides: xawtv-tv-fonts >= 3.95 @@ -55,9 +61,7 @@ Fonts from zvbi converted for use with X11 %setup -q %patch -P 0 -p1 %patch -P 1 -p1 - -# Fix character encodings -iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README +%patch -P 2 -p1 # systemd service file cat >zvbid.service < - 0.2.42-1 +- Update to 0.2.42 + * Sat Jul 20 2024 Fedora Release Engineering - 0.2.35-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild