rpms/dvdstyler/F-18 .cvsignore, 1.13, 1.14 dvdstyler.spec, 1.24, 1.25 sources, 1.14, 1.15
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1852
Modified Files:
.cvsignore dvdstyler.spec sources
Log Message:
* Wed Dec 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.5-1
- New upstream release.
- Added new guide_pt and guide_ro from CVS that was missing in source.
- Minor clean ups
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 22 Nov 2012 21:36:43 -0000 1.13
+++ .cvsignore 26 Dec 2012 05:59:10 -0000 1.14
@@ -1 +1 @@
-DVDStyler-2.3.4.tar.bz2
+DVDStyler-2.3.5.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/dvdstyler.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dvdstyler.spec 24 Nov 2012 02:31:14 -0000 1.24
+++ dvdstyler.spec 26 Dec 2012 05:59:10 -0000 1.25
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
-Version: 2.3.4
-Release: 2%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -10,7 +10,7 @@
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-make-desktopfile-valid.patch
Patch1: dvdstyler-wxVillaLib-libjpeg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: dvdstyler-addmissedGuide_pt.patch
# build
BuildRequires: automake, autoconf
BuildRequires: gettext
@@ -55,6 +55,8 @@
%setup -q -n DVDStyler-%{version}
%patch0 -b .validdesktop
%patch1 -b .libjpeg
+%patch2 -b .guide_pt
+
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -67,7 +69,6 @@
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/dvdstyler
@@ -90,6 +91,11 @@
%{_mandir}/*/*.gz
%changelog
+* Wed Dec 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.5-1
+- New upstream release.
+- Added new guide_pt and guide_ro from CVS that was missing in source.
+- Minor clean ups
+
* Sat Nov 24 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.4-2
- Rebuild for ffmpeg-libs-1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/F-18/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 22 Nov 2012 21:36:43 -0000 1.14
+++ sources 26 Dec 2012 05:59:10 -0000 1.15
@@ -1 +1 @@
-e4e7fab9ff4ef6248f81c7cd6769ecc5 DVDStyler-2.3.4.tar.bz2
+9ca08e1201b2da3cd6e9e483bfb297ee DVDStyler-2.3.5.tar.bz2
11 years, 11 months
rpms/dvdstyler/devel dvdstyler-addmissedGuide_pt.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 dvdstyler.spec, 1.24, 1.25 sources, 1.14, 1.15
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/dvdstyler/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1652
Modified Files:
.cvsignore dvdstyler.spec sources
Added Files:
dvdstyler-addmissedGuide_pt.patch
Log Message:
* Wed Dec 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.5-1
- New upstream release.
- Added new guide_pt and guide_ro from CVS that was missing in source.
- Minor clean ups
dvdstyler-addmissedGuide_pt.patch:
DVDStylerGuide_pt.xml | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++
DVDStylerGuide_ro.xml | 197 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 400 insertions(+)
--- NEW FILE dvdstyler-addmissedGuide_pt.patch ---
--- /dev/null 2012-12-25 19:04:57.390285006 +0000
+++ ./docs/DVDStylerGuide_pt.xml 2012-12-26 03:12:08.933625755 +0000
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article
+ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<article>
+ <title>Guia do DVDStyler</title>
+ <para>
+ Este tutorial mostra os passos necessários à criação de um DVD através do DVDStyler.
+ </para>
+ <para />
+ <orderedlist>
+ <listitem>
+ <para>Cria um novo projeto</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Clica em "Criar um novo projeto" na janela de boas vindas ou clica no botão "Novo" (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/pt/new.png" /></imageobject>
+ </inlinemediaobject>
+ ).
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/pt/welcome.png" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>Introduz a etiqueta do disco (apenas será apresentada no computador).</para>
+ </listitem>
+ <listitem>
+ <para>Seleciona a capacidade do DVD usado: 4.7 GB (DVD de Camada Simples) ou 8.5 GB (DVD de Dupla Camada).</para>
+ </listitem>
+ <listitem>
+ <para>Seleciona o formato de vídeo: Recomenda-se NTSC para países da América do Norte e Japão, e PAL para os restantes.</para>
+ </listitem>
+ <listitem>
+ <para>Após isto, faz "OK".</para>
+ </listitem>
+ <listitem>
+ <para>Findado isto, poderás escolher um título para o menu do DVD e selecionar um modelo.</para>
+ <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/pt/template.jpg" width="500" depth="175" />
+ </imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>Adiciona clips de vídeo</para>
+ <itemizedlist>
+ <listitem>
+ <para>Clica no separador "Procurar ficheiros" na parte esquerda da janela do programa.</para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/pt/fileBrowser.png" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Procura e seleciona a pasta que contém os teus clips de vídeo. Para cada clip,
+ será mostrado um ícone à direita da árvore de diretórios.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Arrasta os clips de vídeo que pretenderes (clique esquerdo, manter premido e arrastar)
+ para o Gestor de Titlesets ao fundo da janela do programa.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/pt/dndVideo.png" width="500" depth="175" />
+ </imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Também poderás adicionar clips de vídeo usando a opção "Adicionar ficheiro..." (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/pt/add.png" /></imageobject>
+ </inlinemediaobject>
+ ) ou arrastanto-os de um gestor de ficheiros como o Explorador do Windows.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ O espaço disponível no DVD é mostrado na barra de estado ao fundo da janela do programa.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/pt/freeSpace.png" /></imageobject>
+ </mediaobject>
+ </para>
+ <para>
+ Num DVD de camada simples (4.7 GB) poderão ser armazenados até 126 minutos de vídeo
+ com boa qualidade (Velocidade de transmição do vídeo ≥ 4.5 MB/s). Se tiveres selecionado
+ "Automático" para a qualidade do vídeo na janela de novo projeto, será então possível usar
+ mais de 126 minutos, em que a qualidade de vídeo é automaticamente reduzida.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Desenvolve um menu de DVD (opcional)</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Clica no separador "Imagens de fundo" na parte esquerda da janela do programa e seleciona uma imagem
+ como fundo para um menu do DVD clicando duas vezes numa imagem do painel das "Imagens de fundo".
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/pt/selectBackground.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ <para>
+ Também poderás usar a tua própria imagem de fundo para um menu do DVD: clica no separador "Procurar ficheiros",
+ abre a pasta que contém a tua imagem e seleciona-a fazendo duplo clique.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Adiciona um título ao menu: faz clique direito no Editor do Menu, clica em "Adicionar", "Texto" e introduz o
+ título. Feito isto, volta a posicionar o texto no sítio pretendido. O tipo de letra e tamanho do título poderão
+ ser alterados na janela das propriedades do texto, que poderá ser aberta fazendo duplo clique no mesmo.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Clica no separador "Botões" do lado da tua mão esquerda na janela do programa e insere um botão arrastando-o
+ (clique esquerdo, manter premido e arrastar) para o Editor do Menu.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/pt/addButton.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Altera as propriedades do botão (ação, texto, cor, tipo de letra, etc.) fazendo duplo clique
+ no botão, estando este no Editor do Menu, e alterando as propriedades necesárias. Assim
+ que estiver tudo concluído, faz "OK" para voltares ao Editor do Menu.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/pt/buttonProperties.png" width="450" depth="430"/>
+ </imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Guarda o projeto
+ </para>
+ <simplelist>
+ <member>
+ Acabaste de configurar um DVD. Clica no botão "Guardar" (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/pt/save.png" /></imageobject>
+ </inlinemediaobject>
+ ) para guardares o projeto.
+ </member>
+ </simplelist>
+ </listitem>
+ <listitem>
+ <para>Grava um DVD</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Clica no botão "Gravar..." (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/pt/run.png" /></imageobject>
+ </inlinemediaobject>
+ ).
+ </para>
+ </listitem>
+ <listitem>
+ <para>Se quiseres obter uma pré-visualização do DVD antes que este seja gravado, não te esqueças de marcar a caixa que diz "Pré-visualizar".</para>
+ </listitem>
+ <listitem>
+ <para>Insere um disco vazio e seleciona a unidade correspondente. Depois, clica em "Iniciar" para que seja iniciado o processo de gravação.</para>
+ <para>Se tiveres selecionado a opção "Pré-visualizar", após a criação do DVD, será iniciada uma pré-visualização do mesmo antes de ser gravado.</para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/pt/burn.png" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Atenção: O processo de criação de DVDs poderá levar várias horas a concluir.
+ </para>
+ </listitem>
+ </orderedlist>
+</article>
--- /dev/null 2012-12-25 19:04:57.390285006 +0000
+++ ./docs/DVDStylerGuide_ro.xml 2012-12-26 03:38:12.557888076 +0000
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article
+ PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<article>
+ <title>Ghid DVDStyler</title>
+ <para>
+ Acest tutorial descrie paşii necesari creării unui DVD utilitând DVDStyler.
+ </para>
+ <para />
+ <orderedlist>
+ <listitem>
+ <para>Crearea unui proiect nou</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Selectaţi 'Creare proiect nou' în dialogul de bun venit sau clic pe butonul Nou (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/ro/new.png" /></imageobject>
+ </inlinemediaobject>
+ ).
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/welcome.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>Introduceţi eticheta discului (va fi afişată doar pe computer).</para>
+ </listitem>
+ <listitem>
+ <para>Selectaţi capacitatea DVD-ului: 4.7 GB (Single Layer DVD) sau 8.5 GB (Double Layer DVD).</para>
+ </listitem>
+ <listitem>
+ <para>Alegeţi formatul video: NTSC este recomandat pentru ţările Americii de Nord şi Japonia, PAL pentru restul ţărilor (inclusiv România).</para>
+ </listitem>
+ <listitem>
+ <para>După aceasta, clic 'OK'.</para>
+ </listitem>
+ <listitem>
+ <para>În final, puteţi introduce un titlu pentru DVD şi puteţi alege un şablon.</para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/template.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>Adăugarea videoclipurilor</para>
+ <itemizedlist>
+ <listitem>
+ <para>Clic pe tab-ul 'Explorator fişiere' din marginea stângă a ferestrei programului.</para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/fileBrowser.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Navigaţi şi daţi clic pe dosarul care conţine videoclipurile dvs. O miniatură
+ a fiecărui videoclip va fi afişată în partea dreaptă a arborelui de dosare.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Trageţi videoclipurile dorite (clic stânga, ţineţi apăsat, trageţi) în managerul grupurilor de titlu
+ de la baza ferestrei programului.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/dndVideo.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Puteţi, de asemenea, adăuga videoclipuri folosind butonul Adaugă un fişier... (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/ro/add.png" /></imageobject>
+ </inlinemediaobject>
+ ) sau prin tragere din orice manager de fişiere, ca de exemplu Windows Explorer.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Spaţiul disponibil pe DVD este afişat în linia de stare, de la baza ferestrei aplicaţiei.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/freeSpace.png" /></imageobject>
+ </mediaobject>
+ </para>
+ <para>
+ Pe un DVD single layer (4.7 GB) pot fi stocate până la 126 de minute video la calitate bună
+ (bitrate video de 4.5 MB/s). Dacă aţi selectat 'Auto' ca şi calitate video în dialogul Proiect nou,
+ este posibilă stocarea a mai mult de 126 de minute, dar calitatea video va fi redusă automat.
+ </para>
+ </listitem>
+ <listitem>
+ <para>Crearea unui meniu pentru DVD (opţional)</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Clic pe tab-ul 'Fundaluri' din marginea stângă a ferestrei programului şi selectaţi
+ o imagine de fundal pentru meniul DVD-ului prin dublu clic pe una din imaginile din panoul 'Fundaluri'.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/selectBackground.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ <para>
+ Puteţi, de asemenea, selecta propria imagine de fundal pentru meniul DVD-ului: clic tab-ul 'Explorator fişiere',
+ deschideţi dosarul care conţine imaginile dvs. şi selectaţi imaginea dorită cu dublu clic.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Adăugarea unui titlu pentru meniu: clic dreapta pe meniu, selectaţi 'Adaugă', 'Text' şi introduceţi titlul.
+ Cu ajutorul săgeţilor, repoziţionaţi textul după dorinţă. Litera şi mărimea titlului pot
+ fi modificate în dialogul Proprietăţi text, care poate fi accesat prin dublu clic pe text.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Clic pe tab-ul 'Butoane' din marginea stângă a ferestrei programului şi inseraţi,
+ prin tragere, (clic stânga, ţineţi apăsat, trageţi), un buton în meniu.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/addButton.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Editaţi proprietăţile butonului (acţiune, titlu, culoare, literă, etc) dând dublu clic pe
+ buton în meniu şi schimbînd caracteristicile adecvate. Când aţi terminat,
+ clic 'OK' pentru reîntoarcere la meniu.
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/buttonProperties.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ Salvaţi proiectul.
+ </para>
+ <simplelist>
+ <member>
+ DVD-ul a fost acum configurat. Clic pe butonul Salvare (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/ro/save.png" /></imageobject>
+ </inlinemediaobject>
+ ) pentru a salva proiectul.
+ </member>
+ </simplelist>
+ </listitem>
+ <listitem>
+ <para>Inscripţionarea DVD-ului</para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Clic pe butonul Inscripţionare (
+ <inlinemediaobject>
+ <imageobject><imagedata fileref="images/ro/run.png" /></imageobject>
+ </inlinemediaobject>
+ ).
+ </para>
+ </listitem>
+ <listitem>
+ <para>Dacă doriţi să previzualizaţi DVD-ul finalizat, înainte de inscripţionare, bifaţi 'previzualizare' în dialogul Inscripţionare.</para>
+ </listitem>
+ <listitem>
+ <para>Introduceţi un disc gol în dispozitivul corespunzător. Apoi, clic 'Pornire' pentru inscripţionarea discului.</para>
+ <para>Dacă aţi selectat 'previzualizare', aceasta va porni după crearea DVD-ului (dar înainte de inscripţionarea pe disc).</para>
+ <para>
+ <mediaobject>
+ <imageobject><imagedata fileref="images/ro/burn.jpg" /></imageobject>
+ </mediaobject>
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Atenţionare: Procesul creării unui DVD poate dura chiar şi câteva ore.
+ Acest tutorial a fost creat de Dan Ibănescu (ibanescu.dan(a)gmail.com).
+ </para>
+ </listitem>
+ </orderedlist>
+</article>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 22 Nov 2012 21:27:49 -0000 1.13
+++ .cvsignore 26 Dec 2012 05:54:10 -0000 1.14
@@ -1 +1 @@
-DVDStyler-2.3.4.tar.bz2
+DVDStyler-2.3.5.tar.bz2
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- dvdstyler.spec 24 Nov 2012 02:30:25 -0000 1.24
+++ dvdstyler.spec 26 Dec 2012 05:54:10 -0000 1.25
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
-Version: 2.3.4
-Release: 2%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -10,7 +10,7 @@
Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}.tar.bz2
Patch0: dvdstyler-make-desktopfile-valid.patch
Patch1: dvdstyler-wxVillaLib-libjpeg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: dvdstyler-addmissedGuide_pt.patch
# build
BuildRequires: automake, autoconf
BuildRequires: gettext
@@ -55,6 +55,8 @@
%setup -q -n DVDStyler-%{version}
%patch0 -b .validdesktop
%patch1 -b .libjpeg
+%patch2 -b .guide_pt
+
%{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h
%build
@@ -67,7 +69,6 @@
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/dvdstyler
@@ -90,6 +91,11 @@
%{_mandir}/*/*.gz
%changelog
+* Wed Dec 26 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.5-1
+- New upstream release.
+- Added new guide_pt and guide_ro from CVS that was missing in source.
+- Minor clean ups
+
* Sat Nov 24 2012 Sérgio Basto <sergio(a)serjux.com> - 2.3.4-2
- Rebuild for ffmpeg-libs-1.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 22 Nov 2012 21:27:49 -0000 1.14
+++ sources 26 Dec 2012 05:54:10 -0000 1.15
@@ -1 +1 @@
-e4e7fab9ff4ef6248f81c7cd6769ecc5 DVDStyler-2.3.4.tar.bz2
+9ca08e1201b2da3cd6e9e483bfb297ee DVDStyler-2.3.5.tar.bz2
11 years, 11 months
rpms/VirtualBox-kmod/F-16 VirtualBox-kmod.spec,1.35,1.36
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6882
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Tue Dec 25 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-16/VirtualBox-kmod.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- VirtualBox-kmod.spec 23 Dec 2012 09:39:41 -0000 1.35
+++ VirtualBox-kmod.spec 25 Dec 2012 21:06:42 -0000 1.36
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -19,8 +19,8 @@
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.2.4
-Release: 3%{?prerel:.%{prerel}}%{?dist}.8
+Version: 4.2.6
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Tue Dec 25 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
+- New upstream release.
+
* Sun Dec 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.4-3.8
- Rebuilt for updated kernel
11 years, 11 months
rpms/mythweb/EL-6 sources,1.2,1.3
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31106
Modified Files:
sources
Log Message:
Use proper source.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 6 Jul 2012 18:07:34 -0000 1.2
+++ sources 25 Dec 2012 13:30:03 -0000 1.3
@@ -1 +1 @@
-70d2ee6ffe336f609a955df002ae0cbd MythTV-mythweb-v0.25.1-0-g89a347c.tar.gz
+806f8a2187cfad356da541303120f048 MythTV-mythweb-v0.26.0-0-g4dcd253.tar.gz
11 years, 11 months
rpms/mythweb/EL-6 mythweb-0.26-fixes.patch, NONE, 1.1 ChangeLog, 1.1, 1.2 mythweb.spec, 1.1, 1.2 mythweb-fixes.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30919
Modified Files:
ChangeLog mythweb.spec
Added Files:
mythweb-0.26-fixes.patch
Removed Files:
mythweb-fixes.patch
Log Message:
* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
- Update to latest upstream release.
mythweb-0.26-fixes.patch:
classes/Video.php | 14 ++++---
modules/stream/stream_raw.pl | 4 ++
modules/video/handler.php | 26 +++++++++----
modules/video/stream.php | 69 +++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 -
mythweb.php | 2 -
6 files changed, 101 insertions(+), 16 deletions(-)
--- NEW FILE mythweb-0.26-fixes.patch ---
classes/Video.php | 14 ++++----
modules/stream/stream_raw.pl | 4 +++
modules/video/handler.php | 26 +++++++++-----
modules/video/stream.php | 69 ++++++++++++++++++++++++++++++++++++
modules/video/tmpl/default/video.php | 2 +-
mythweb.php | 2 +-
6 files changed, 101 insertions(+), 16 deletions(-)
diff --git a/classes/Video.php b/classes/Video.php
index 7995aa4..5c6f7e4 100644
--- a/classes/Video.php
+++ b/classes/Video.php
@@ -90,12 +90,14 @@ class Video {
$this->childid = $video['childid'];
// Figure out the URL
$this->url = '#';
- if (file_exists('data/video/'))
- $this->url = implode('/', array_map('rawurlencode',
- array_map('utf8tolocal',
- explode('/',
- 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
- ))));
+ //// all junk, replacing
+// if (file_exists('data/video/'))
+// $this->url = implode('/', array_map('rawurlencode',
+// array_map('utf8tolocal',
+// explode('/',
+// 'data/video/' . preg_replace('#^'.$mythvideo_dir.'/?#', '', $this->filename)
+// ))));
+ $this->url = 'video/stream?Id=' . $this->intid;
$genre = $db->query('SELECT idgenre
FROM videometadatagenre
WHERE idvideo = ?',
diff --git a/modules/stream/stream_raw.pl b/modules/stream/stream_raw.pl
index 31f6854..6981bca 100755
--- a/modules/stream/stream_raw.pl
+++ b/modules/stream/stream_raw.pl
@@ -30,6 +30,10 @@
$type = 'video/nuppelvideo';
$suffix = '.nuv';
}
+ elsif ($basename =~ /\.mkv$/) {
+ $type = 'video/x-matroska';
+ $suffix = '.mkv';
+ }
else {
print header(),
"Unknown video type requested: $basename\n";
diff --git a/modules/video/handler.php b/modules/video/handler.php
index fd769ce..721f186 100644
--- a/modules/video/handler.php
+++ b/modules/video/handler.php
@@ -15,8 +15,10 @@
* @global string $GLOBALS['mythvideo_dir']
* @name $mythvideo_dir
/**/
- global $mythvideo_dir;
- $mythvideo_dir = setting('VideoStartupDir', hostname);
+
+//// dont need this...
+// global $mythvideo_dir;
+// $mythvideo_dir = setting('VideoStartupDir', hostname);
// Load the video storage directories
$video_dirs = $db->query_list('
@@ -37,6 +39,7 @@
}
}
+/** nor any of this...
// Make sure the video directory exists
if (file_exists('data/video')) {
// File is not a directory or a symlink
@@ -93,7 +96,7 @@
.' reload this page.');
}
// Create a symlink to the first artwork directory that we find.
- /** @todo we should really support multiple directories, but it's too much effort to hack in at the moment. */
+ // @todo we should really support multiple directories, but it's too much effort to hack in at the moment.
else {
foreach ($artwork_dirs as $dir) {
if (is_dir($dir) || is_link($dir)) {
@@ -116,6 +119,7 @@
}
}
}
+*/
define('video_img_height', _or(setting('web_video_thumbnail_height', hostname), 140));
define('video_img_width', _or(setting('web_video_thumbnail_width', hostname), 94));
@@ -125,11 +129,17 @@
case 'edit':
require_once 'modules/video/edit.php';
exit;
- case 'imdb':
- require_once 'modules/video/imdb.php';
- exit;
- case 'scan':
- require_once 'modules/video/scan.php';
+//// this is probably doing bad things
+// case 'imdb':
+// require_once 'modules/video/imdb.php';
+// exit;
+//// this is broken, so disable it
+// case 'scan':
+// require_once 'modules/video/scan.php';
+// exit;
+//// new stuff
+ case 'stream':
+ require_once 'modules/video/stream.php';
exit;
}
diff --git a/modules/video/stream.php b/modules/video/stream.php
new file mode 100644
index 0000000..49a7298
--- /dev/null
+++ b/modules/video/stream.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Stream a music file
+ *
+ * @license GPL
+ *
+ * @package MythWeb
+ * @subpackage Music
+/**/
+
+// Yes, a db connection
+ global $db;
+
+// Pull video ID
+ $vid_id = $_GET['Id'];
+
+// Get filename
+ list($fname) = $db->query_row('SELECT filename
+ FROM videometadata
+ WHERE intid = ?', $vid_id);
+
+// Mime type
+ switch (substr($fname, strrpos($fname, '.'))) {
+ case 'mpg':
+ case 'mpeg':
+ $mime = 'video/mpeg';
+ break;
+ case 'mp4':
+ $mime = 'video/mp4';
+ break;
+ case 'ogg':
+ case 'ogm':
+ case 'ogv':
+ $mime = 'video/ogg';
+ break;
+ case 'qt':
+ $mime = 'video/quicktime';
+ break;
+ case 'webm':
+ $mime = 'video/webm';
+ break;
+ case 'mkv':
+ $mime = 'video/x-matroska';
+ break;
+ case 'wmv':
+ $mime = 'video/x-ms-wmv';
+ break;
+ case 'flv':
+ $mime = 'video/x-flv';
+ break;
+ default:
+ $mime = 'applicatoin/octet-stream';
+ }
+ header('Content-Type: '.$mime);
+
+// Send the filename
+ header('Content-Disposition: filename="'.$fname.'"');
+
+// Send data via the backend
+ $Master_Host = setting('MasterServerIP');
+ $port = _or(get_backend_setting('BackendStatusPort', $Master_Host),
+ get_backend_setting('BackendStatusPort'));
+ if (stripos($Master_Host,':') !== false) {
+ $Master_Host = '['.$Master_Host.']';
+ }
+ readfile("http://$Master_Host:$port/Content/GetVideo?Id=".$vid_id);
+
+// Nothing else to do
+ exit;
diff --git a/modules/video/tmpl/default/video.php b/modules/video/tmpl/default/video.php
index e80176e..ad7e9a9 100644
--- a/modules/video/tmpl/default/video.php
+++ b/modules/video/tmpl/default/video.php
@@ -252,7 +252,7 @@
<table width="100%" border="0" cellpadding="4" cellspacing="2" class="list small">
<tr class="menu">
<td>
- <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span>
+<!-- Bad! Don't do this! <span style="float: right"><input type="button" value="<?php echo t('Scan Collection'); ?>" class="submit" onclick="scan()"></span> -->
<form action="<?php echo root_url; ?>video" method="GET">
<?php echo t('Display'); ?>:
<select name="category" id="category" onchange="filter();">
diff --git a/mythweb.php b/mythweb.php
index bba2aa8..79ff196 100644
--- a/mythweb.php
+++ b/mythweb.php
@@ -30,7 +30,7 @@
if (Modules::getModule($Path[0])) {
// Add the current module directory to our search path, so modules can
// define includes, etc.
- ini_set('include_path', ini_get('include_path').':'.modules_path.'/'.$Path[0]);
+ ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.modules_path.'/'.$Path[0]);
// Load the module handler
require_once 'handler.php';
}
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/EL-6/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog 6 Jul 2012 18:07:34 -0000 1.1
+++ ChangeLog 25 Dec 2012 13:22:36 -0000 1.2
@@ -1,52 +1,21 @@
-commit 89a347c85284c5cf3ca3ad7250f21c7e698af858
-Author: Michael T. Dean <mdean(a)mythtv.org>
-Date: Wed May 30 17:19:55 2012 -0400
+commit f82ca9521775edbbc53caf0f40f7bc183732dcc2
+Author: Karl Dietz <dekarl(a)users.sourceforge.net>
+Date: Fri Aug 3 23:26:30 2012 +0200
- Fix MythWeb Upcoming Recordings programinfo usage.
+ Use PATH_SEPARATOR rather than ':' in mythweb.php.
- The programinfo refactor in #8406 changed the order of fields returned
- in a programinfo string list, and a reference was missed in the MythWeb
- Schedule class. The result is that any recording rule with recordid of
- 6 was skipped/didn't show in Upcoming Recordings.
+ Fixes #10791
- The original intent of the code was to skip recordings with recstatus of
- rsNotListed (as shown in commits e728aea5 and 508103511 , committed for
- which has since been modified, again, by a41e9657. (Therefore, the
- index in this commit is correct for 0.25-fixes and above, but should be
- 18 for 0.24-fixes.)
-
- Thanks to JK on the -users list for finding the issue.
- (cherry picked from commit 39a5dcd101ce7a6b97474f7b824b358f6e05c0cd)
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit f9f5a1f43f2ddfeaa038054226f6ac0aa0b973e6)
-commit 8c43d8da31d738c75ec6abc9daff2772b16310c8
-Author: David Engel <david(a)istwok.net>
-Date: Mon Apr 30 17:01:44 2012 -0500
+commit 4fd9d5e05065c31e574e69251f872b1f53b7b027
+Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
+Date: Tue Oct 16 06:00:31 2012 -0400
- Clear the search type when creating an override or don't record for
- non-manual rules. Based on a patch from david.osguthorpe.
+ Add recognition of mkv containers to MythWeb for raw streaming.
- Fixes #10580 and fixes #10650 .
-
-commit 1833030d2ce0b5f2ec4f507031e6628458ca46b9
-Author: Kenni Lund <kenni(a)mythtv.org>
-Date: Wed Apr 11 21:06:29 2012 +0200
-
- Convert the Spanish (es_es) translation files to UTF8.
+ Fixes #11180
- Refs. #10575.
-
-commit 4d6e6219083446c024e8467cbff64ab42521b05c
-Author: Antonio Marcos López Alonso <amlopezalonso(a)gmail.com>
-Date: Wed Apr 11 20:55:18 2012 +0200
-
- Update the Spanish translation.
-
- Refs. #10575.
-
- Signed-off-by: Kenni Lund <kenni(a)mythtv.org>
-
-commit ed863708c02dd3620a7f4c0e37b118d00e712daa
-Author: Gavin Hurlbut <ghurlbut(a)mythtv.org>
-Date: Tue Apr 10 00:18:10 2012 -0700
-
- Force a commit
+ Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
+ (cherry picked from commit ce2368132f823284588b02f8a1f66e0576d8c107)
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/EL-6/mythweb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythweb.spec 6 Jul 2012 18:07:34 -0000 1.1
+++ mythweb.spec 25 Dec 2012 13:22:36 -0000 1.2
@@ -1,15 +1,14 @@
# Mythweb from github.com
# git hash for archive
-%global githash1 g89a347c
-# git hash for root source directory
-%global githash2 ae20c88
+%global githash1 g4dcd253
+%global githash2 4e9fd7a
Name: mythweb
Summary: The web interface to MythTV
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.25.1
+Version: 0.26.0
Release: 2%{?dist}
License: GPLv2 and LGPLv2 and MIT
@@ -19,9 +18,11 @@
Source1: mythweb.conf
Source2: ChangeLog
+Patch0: mythweb-0.26-fixes.patch
+
# Patch generated from mythweb fixes branch. From mythweb git directory:
# git diff -p --stat %{version} > mythweb-fixes.patch
-Patch1: mythweb-fixes.patch
+#Patch0: mythweb-fixes.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -33,6 +34,7 @@
Requires: php-mysql
Requires: php-process
Requires: php-MythTV >= %{version}
+Requires: mythffmpeg
BuildArch: noarch
@@ -43,7 +45,7 @@
%prep
%setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .mythweb
+%patch0 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -64,17 +66,31 @@
cp -a * %{buildroot}%{_datadir}/mythweb/
mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-# drop .htaccess file, settings handled in the above
-rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
+
+# Remove stuff covered by %%doc
+rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
%files
%doc README LICENSE ChangeLog
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%defattr(-,apache,apache,0755)
%{_datadir}/mythweb/
%changelog
+* Sat Dec 08 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-2
+- Update to latest upstream release.
+
+* Sun Oct 28 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-1
+- Update to latest upstream release.
+
+* Mon Jul 30 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.2-1
+- Update to latests release.
+
+* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-3
+- Patch for PHP 5.4 warnings.
+
* Sun Jul 01 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.25.1-2
- Lots of tweaks per review request:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=2366
--- mythweb-fixes.patch DELETED ---
11 years, 11 months
rpms/VirtualBox-kmod/F-17 VirtualBox-kmod.spec,1.41,1.42
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12916
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Tue Nov 06 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
- Rebuild to build missed akmod-VirtualBox, my fault not comment well definition of buildforkernels.
11 years, 11 months
rpms/VirtualBox/F-17 VirtualBox-4.2.4-no-bundles.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 VirtualBox.spec, 1.11, 1.12 sources, 1.39, 1.40
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12343
Modified Files:
.cvsignore VirtualBox.spec sources
Added Files:
VirtualBox-4.2.4-no-bundles.patch
Log Message:
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
- Fix some changelog dates.
VirtualBox-4.2.4-no-bundles.patch:
Config.kmk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.4-no-bundles.patch ---
--- ./Config.kmk.libcxx 2012-10-26 17:23:13.000000000 +0100
+++ ./Config.kmk 2012-11-24 14:46:31.187664914 +0000
@@ -2587,26 +2587,25 @@ VBOXLNX32GUEST_SUFF_LIB = .a
# SDKs for external libraries.
#
SDK_VBOX_LIBXML2 = .
-SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include
+SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2
SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT
SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
# note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
# libxml against VBoxRT
SDK_VBOX_LIBPNG = .
-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8
+SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15
SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
SDK_VBOX_ZLIB = .
if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
+ SDK_VBOX_ZLIB_INCS ?= /usr/include/
SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
else
SDK_VBOX_ZLIB_INCS ?=
SDK_VBOX_ZLIB_LIBS ?= z
SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
endif
-
SDK_VBOX_OPENSSL = Only for VBoxRT and/or statically linked programs.
SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include
SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 28 Oct 2012 17:58:48 -0000 1.39
+++ .cvsignore 25 Dec 2012 05:29:28 -0000 1.40
@@ -1 +1 @@
-VirtualBox-4.2.4.tar.bz2
+VirtualBox-4.2.6.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/VirtualBox.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VirtualBox.spec 28 Oct 2012 17:58:48 -0000 1.11
+++ VirtualBox.spec 25 Dec 2012 05:29:28 -0000 1.12
@@ -13,8 +13,20 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+#if 0%{?fedora} < 20
+%global enable_webservice 1
+#else
+#global enable_webservice 0
+#endif
+
+%if 0%{?fedora} < 18
+%global enable_docs 1
+%else
+%global enable_docs 0
+%endif
+
Name: VirtualBox
-Version: 4.2.4
+Version: 4.2.6
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -43,6 +55,7 @@
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
+Patch26: VirtualBox-4.2.4-no-bundles.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -63,7 +76,12 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+BuildRequires: boost-devel
+#BuildRequires: liblzf-devel
+BuildRequires: libxml2-devel
BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: device-mapper-devel
#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
@@ -195,6 +213,8 @@
%patch25 -p1 -b .xorg111
%endif
+%patch26 -p1 -b .nobundles
+
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
rm -rf kBuild
@@ -204,18 +224,29 @@
# Remove some bundle X11 sources.
rm -rf src/VBox/Additions/x11/x11include
rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/libs/boost-1.37.0/
+#rm -rf src/libs/liblzf-3.4/
+rm -rf src/libs/libxml2-2.6.31/
+rm -rf src/libs/libpng-1.2.8/
+rm -rf src/libs/zlib-1.2.6/
# CRLF->LF
sed -i 's/\r//' COPYING
+# Testings
+#for S in doc/manual/fr_FR/*xml
+#do
+# sed -i 's/[&][a-zA-Z0-9]\{2,5\}[;]/ /g' $S
+#done
%build
./configure --disable-kmods \
-%if 0%{?fedora} > 17
- --disable-docs
+%if %{enable_webservice}
+ --enable-webservice \
%endif
-%if 0%{?fedora} < 18
- --enable-webservice
+%if %{enable_docs}
+%else
+ --disable-docs \
%endif
#--disable-java
@@ -274,7 +305,7 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
%endif
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
@@ -296,13 +327,6 @@
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
-# Documentation
-%if 0%{?fedora} < 18
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/UserManual.pdf
-%endif
-
-
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxHeadless \
@@ -318,7 +342,7 @@
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/VBoxBalloonCtrl \
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
obj/bin/vboxwebsrv \
obj/bin/webtest \
%endif
@@ -440,11 +464,6 @@
/usr/bin/update-desktop-database &>/dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
-# Web service
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
@@ -453,7 +472,8 @@
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
-
+# should be in kmod package, not here
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ] ; then
@@ -462,8 +482,14 @@
/bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
fi
-
%postun
+if [ $1 -eq 0 ] ; then
+ # Package upgrade, not uninstall
+ # Web service
+ # Run these because the SysV package being removed won't do them
+ /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+fi
+
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
/usr/bin/update-desktop-database &>/dev/null || :
@@ -472,12 +498,14 @@
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-# Guest additions install the OGL libraries
+# Guest additions install
%post guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+# should be in kmod package, not here
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
+/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
%preun guest
if [ $1 -eq 0 ] ; then
@@ -489,11 +517,6 @@
%postun guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
-fi
-
%files
%{_bindir}/VBox
@@ -510,14 +533,11 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_bindir}/vboxwebsrv
%endif
%{_bindir}/VBoxVRDP
-%if 0%{?fedora} < 18
%dir %{_libdir}/virtualbox
-%doc %{_libdir}/virtualbox/*.pdf
-%endif
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
@@ -528,7 +548,7 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
%endif
@@ -546,7 +566,11 @@
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%doc COPYING
+%doc COPYING*
+%doc doc/*.*
+%if %{enable_docs}
+%doc obj/bin/UserManual*.pdf
+%endif
%{_unitdir}/vboxweb.service
/lib/udev/VBoxCreateUSBNode.sh
@@ -584,6 +608,20 @@
%changelog
+* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
+- New upstream release.
+- Fix some changelog dates.
+
+* Sun Dec 02 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
+- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
+- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
+- Unbundle sources that aren't used.
+
+* Mon Oct 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-2
+- Try load new vbox modules right after install or upgrade.
+- Try better reload of vboxservice.service when as guest system.
+- Minor improves on systemd upgrade.
+
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
@@ -733,7 +771,7 @@
apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
- drop Patch to allow to build with GCC 4.7
-* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
+* Sun Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
- Patch to allow to build with GCC 4.7
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
@@ -892,18 +930,18 @@
- Exchange hardening for filesystem capabilities
- Enable web services
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
- Include VBoxRandR
- Add dri module to guest
- Resize attempts in GDM make SELinux unhappy
- Fix HAL policy file location
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
- Add python- subpackage
- Correct permissions on SDK directories (#754)
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash
@@ -1059,7 +1097,7 @@
- Update to new version
- Adapt to new kBuild version, which seems to be needed
-* Wed Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
+* Sat Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
- minor bugfixes in the wrapper script
- rename to VirtualBox-OSE
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-17/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 28 Oct 2012 17:58:48 -0000 1.39
+++ sources 25 Dec 2012 05:29:28 -0000 1.40
@@ -1 +1 @@
-d1ec2d2a3f2f3f0b277dfe2c520c2e33 VirtualBox-4.2.4.tar.bz2
+d680aeb3b4379b8281527aeb012b2df5 VirtualBox-4.2.6.tar.bz2
11 years, 11 months
rpms/VirtualBox/F-16 VirtualBox-4.2.4-no-bundles.patch, NONE, 1.1 .cvsignore, 1.39, 1.40 VirtualBox.spec, 1.10, 1.11 sources, 1.39, 1.40
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11983
Modified Files:
.cvsignore VirtualBox.spec sources
Added Files:
VirtualBox-4.2.4-no-bundles.patch
Log Message:
* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
- Fix some changelog dates.
* Sun Dec 02 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
- Use global variables enable_webservice and enable_docs to deal better with enable and disable
that.
- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
- Unbundle sources that aren't used.
* Mon Oct 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-2
- Try load new vbox modules right after install or upgrade.
- Try better reload of vboxservice.service when as guest system.
- Minor improves on systemd upgrade.
VirtualBox-4.2.4-no-bundles.patch:
Config.kmk | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.4-no-bundles.patch ---
--- ./Config.kmk.libcxx 2012-10-26 17:23:13.000000000 +0100
+++ ./Config.kmk 2012-11-24 14:46:31.187664914 +0000
@@ -2587,26 +2587,25 @@ VBOXLNX32GUEST_SUFF_LIB = .a
# SDKs for external libraries.
#
SDK_VBOX_LIBXML2 = .
-SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include
+SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2
SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT
SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
# note: no linking to LIB here, we do that explicitly in src/VBox/Runtime/Makefile.kmk to link
# libxml against VBoxRT
SDK_VBOX_LIBPNG = .
-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8
+SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15
SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
SDK_VBOX_ZLIB = .
if1of ($(KBUILD_TARGET), os2 solaris win)
- SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
+ SDK_VBOX_ZLIB_INCS ?= /usr/include/
SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
else
SDK_VBOX_ZLIB_INCS ?=
SDK_VBOX_ZLIB_LIBS ?= z
SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
endif
-
SDK_VBOX_OPENSSL = Only for VBoxRT and/or statically linked programs.
SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS := $(PATH_OUT)/obj/crypto-headers/include
SDK_VBOX_OPENSSL_INCS ?= $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 29 Oct 2012 04:39:49 -0000 1.39
+++ .cvsignore 25 Dec 2012 05:10:53 -0000 1.40
@@ -1 +1 @@
-VirtualBox-4.2.4.tar.bz2
+VirtualBox-4.2.6.tar.bz2
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/VirtualBox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- VirtualBox.spec 29 Oct 2012 04:39:49 -0000 1.10
+++ VirtualBox.spec 25 Dec 2012 05:10:53 -0000 1.11
@@ -13,8 +13,20 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
+#if 0%{?fedora} < 20
+%global enable_webservice 1
+#else
+#global enable_webservice 0
+#endif
+
+%if 0%{?fedora} < 18
+%global enable_docs 1
+%else
+%global enable_docs 0
+%endif
+
Name: VirtualBox
-Version: 4.2.4
+Version: 4.2.6
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -43,6 +55,7 @@
Patch23: VirtualBox-4.2.0-mesa.patch
Patch24: VirtualBox-4.2.0-VBoxGuestLib.patch
Patch25: VirtualBox-4.2.0-xorg111.patch
+Patch26: VirtualBox-4.2.4-no-bundles.patch
%if 0%{?fedora} < 16
BuildRequires: kBuild >= 0.1.98
@@ -63,7 +76,12 @@
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
+BuildRequires: boost-devel
+#BuildRequires: liblzf-devel
+BuildRequires: libxml2-devel
BuildRequires: libpng-devel
+BuildRequires: zlib-devel
+BuildRequires: device-mapper-devel
#BuildRequires: glibc(x86-32) glibc-devel(x86-32) libstdc++(x86-32)
#BuildRequires: glibc.i686 glibc-devel.i686 libstdc++.i686
#BuildRequires: /usr/lib/libc.so
@@ -195,6 +213,8 @@
%patch25 -p1 -b .xorg111
%endif
+%patch26 -p1 -b .nobundles
+
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
rm -rf kBuild
@@ -204,18 +224,29 @@
# Remove some bundle X11 sources.
rm -rf src/VBox/Additions/x11/x11include
rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/libs/boost-1.37.0/
+#rm -rf src/libs/liblzf-3.4/
+rm -rf src/libs/libxml2-2.6.31/
+rm -rf src/libs/libpng-1.2.8/
+rm -rf src/libs/zlib-1.2.6/
# CRLF->LF
sed -i 's/\r//' COPYING
+# Testings
+#for S in doc/manual/fr_FR/*xml
+#do
+# sed -i 's/[&][a-zA-Z0-9]\{2,5\}[;]/ /g' $S
+#done
%build
./configure --disable-kmods \
-%if 0%{?fedora} > 17
- --disable-docs
+%if %{enable_webservice}
+ --enable-webservice \
%endif
-%if 0%{?fedora} < 18
- --enable-webservice
+%if %{enable_docs}
+%else
+ --disable-docs \
%endif
#--disable-java
@@ -274,7 +305,7 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
%endif
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
@@ -296,13 +327,6 @@
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
-# Documentation
-%if 0%{?fedora} < 18
-install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/UserManual.pdf
-%endif
-
-
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxHeadless \
@@ -318,7 +342,7 @@
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/VBoxBalloonCtrl \
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
obj/bin/vboxwebsrv \
obj/bin/webtest \
%endif
@@ -440,11 +464,6 @@
/usr/bin/update-desktop-database &>/dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
-# Web service
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
then
@@ -453,7 +472,8 @@
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
-
+# should be in kmod package, not here
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
%preun
if [ $1 -eq 0 ] ; then
@@ -462,8 +482,14 @@
/bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
fi
-
%postun
+if [ $1 -eq 0 ] ; then
+ # Package upgrade, not uninstall
+ # Web service
+ # Run these because the SysV package being removed won't do them
+ /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+fi
+
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
/usr/bin/update-desktop-database &>/dev/null || :
@@ -472,12 +498,14 @@
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-# Guest additions install the OGL libraries
+# Guest additions install
%post guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+# should be in kmod package, not here
+/bin/systemctl try-restart fedora-loadmodules.service >/dev/null 2>&1 || :
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
+/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
%preun guest
if [ $1 -eq 0 ] ; then
@@ -489,11 +517,6 @@
%postun guest
/sbin/ldconfig
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
- /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
-fi
-
%files
%{_bindir}/VBox
@@ -510,14 +533,11 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_bindir}/vboxwebsrv
%endif
%{_bindir}/VBoxVRDP
-%if 0%{?fedora} < 18
%dir %{_libdir}/virtualbox
-%doc %{_libdir}/virtualbox/*.pdf
-%endif
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
@@ -528,7 +548,7 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-%if 0%{?fedora} < 18
+%if %{enable_webservice}
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
%endif
@@ -546,7 +566,11 @@
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
-%doc COPYING
+%doc COPYING*
+%doc doc/*.*
+%if %{enable_docs}
+%doc obj/bin/UserManual*.pdf
+%endif
%{_unitdir}/vboxweb.service
/lib/udev/VBoxCreateUSBNode.sh
@@ -584,6 +608,20 @@
%changelog
+* Mon Dec 24 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
+- New upstream release.
+- Fix some changelog dates.
+
+* Sun Dec 02 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-3
+- Use global variables enable_webservice and enable_docs to deal better with enable and disable that.
+- Include fr UserManual.pdf and put this docs in /usr/share/docs (the right place) .
+- Unbundle sources that aren't used.
+
+* Mon Oct 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-2
+- Try load new vbox modules right after install or upgrade.
+- Try better reload of vboxservice.service when as guest system.
+- Minor improves on systemd upgrade.
+
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
@@ -733,7 +771,7 @@
apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
- drop Patch to allow to build with GCC 4.7
-* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
+* Sun Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
- Patch to allow to build with GCC 4.7
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
@@ -892,18 +930,18 @@
- Exchange hardening for filesystem capabilities
- Enable web services
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
- Include VBoxRandR
- Add dri module to guest
- Resize attempts in GDM make SELinux unhappy
- Fix HAL policy file location
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
- Add python- subpackage
- Correct permissions on SDK directories (#754)
-* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
+* Sat Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash
@@ -1059,7 +1097,7 @@
- Update to new version
- Adapt to new kBuild version, which seems to be needed
-* Wed Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
+* Sat Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
- minor bugfixes in the wrapper script
- rename to VirtualBox-OSE
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-16/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 29 Oct 2012 04:39:49 -0000 1.39
+++ sources 25 Dec 2012 05:10:53 -0000 1.40
@@ -1 +1 @@
-d1ec2d2a3f2f3f0b277dfe2c520c2e33 VirtualBox-4.2.4.tar.bz2
+d680aeb3b4379b8281527aeb012b2df5 VirtualBox-4.2.6.tar.bz2
11 years, 11 months
rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.14,1.15
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11670
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Tue Dec 25 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-18/VirtualBox-kmod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- VirtualBox-kmod.spec 21 Dec 2012 21:21:54 -0000 1.14
+++ VirtualBox-kmod.spec 25 Dec 2012 05:05:27 -0000 1.15
@@ -19,8 +19,8 @@
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.2.4
-Release: 1%{?prerel:.%{prerel}}%{?dist}.4
+Version: 4.2.6
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Tue Dec 25 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
+- New upstream release.
+
* Fri Dec 21 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.4-1.4
- Rebuilt for current f18 kernel
11 years, 11 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.8,1.9
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10452
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Tue Dec 25 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
- New upstream release.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VirtualBox-kmod.spec 25 Dec 2012 03:32:42 -0000 1.8
+++ VirtualBox-kmod.spec 25 Dec 2012 03:59:26 -0000 1.9
@@ -98,6 +98,9 @@
%changelog
+* Tue Dec 25 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.6-1
+- New upstream release.
+
* Sun Sep 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-2
- Build with newest VirtualBox-kmodsrc (4.2.0-3).
11 years, 11 months