rpms/gstreamer-plugins-good/F-12 gstreamer-plugins-good.spec, 1.121, 1.122
by Benjamin Otte
Author: company
Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25431
Modified Files:
gstreamer-plugins-good.spec
Log Message:
add new plugins
Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- gstreamer-plugins-good.spec 31 May 2010 19:51:25 -0000 1.121
+++ gstreamer-plugins-good.spec 31 May 2010 20:03:11 -0000 1.122
@@ -179,6 +179,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstflv.so
%{_libdir}/gstreamer-%{majorminor}/libgsty4menc.so
%{_libdir}/gstreamer-%{majorminor}/libgstshapewipe.so
+%{_libdir}/gstreamer-%{majorminor}/libgstimagefreeze.so
+%{_libdir}/gstreamer-%{majorminor}/libgstoss4audio.so
+%{_libdir}/gstreamer-%{majorminor}/libgstvideofilter.so
# gstreamer-plugins with external dependencies but in the main package
#%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so
13 years, 6 months
rpms/squid/F-12 .cvsignore, 1.63, 1.64 sources, 1.66, 1.67 squid.spec, 1.167, 1.168
by Henrik Nordström
Author: hno
Update of /cvs/pkgs/rpms/squid/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25391
Modified Files:
.cvsignore sources squid.spec
Log Message:
List header case-insensitiveness bugfix
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore 30 May 2010 16:02:54 -0000 1.63
+++ .cvsignore 31 May 2010 20:02:59 -0000 1.64
@@ -1,2 +1,3 @@
squid-3.1.4.tar.bz2
squid-3.1.4.tar.bz2.asc
+squid-3-10526.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/sources,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- sources 30 May 2010 16:02:54 -0000 1.66
+++ sources 31 May 2010 20:02:59 -0000 1.67
@@ -1,2 +1,3 @@
3fb544ae02fadc2b4085f62bb927e861 squid-3.1.4.tar.bz2
a4abc8a4710d6fc59478293125f027bc squid-3.1.4.tar.bz2.asc
+9601e84f06b7bbe4e44c133f9d0c585f squid-3-10526.patch
Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-12/squid.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- squid.spec 30 May 2010 16:02:54 -0000 1.167
+++ squid.spec 31 May 2010 20:02:59 -0000 1.168
@@ -4,7 +4,7 @@
Name: squid
Version: 3.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2+
@@ -22,6 +22,7 @@ Source98: perl-requires-squid.sh
# Upstream patches
#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-xxxx.patch
+Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10526.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@@ -70,6 +71,7 @@ lookup program (dnsserver), a program fo
%setup -q
#patch001 -p0 -b .3.1-xxxx
+%patch001 -p0 -b .3-10526
%patch201 -p1 -b .config
%patch202 -p1 -b .location
@@ -256,6 +258,9 @@ fi
chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
%changelog
+* Mon May 31 2010 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 7: 3.1.4-2
+- Correct case-insensitiveness in HTTP list header parsing
+
* Sun May 30 2010 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 7:3.1.4-1
- Upstream 3.1.4 bugfix release, issues relating to IPv6, TPROXY, Memory
management, follow_x_forwarded_for, and stability fixes
13 years, 6 months
rpms/squid/F-13 .cvsignore, 1.64, 1.65 sources, 1.67, 1.68 squid.spec, 1.171, 1.172
by Henrik Nordström
Author: hno
Update of /cvs/pkgs/rpms/squid/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24890
Modified Files:
.cvsignore sources squid.spec
Log Message:
List header case-insensitiveness bugfix
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-13/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore 30 May 2010 15:05:49 -0000 1.64
+++ .cvsignore 31 May 2010 20:00:20 -0000 1.65
@@ -1,2 +1,3 @@
squid-3.1.4.tar.bz2
squid-3.1.4.tar.bz2.asc
+squid-3-10526.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-13/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sources 30 May 2010 15:05:49 -0000 1.67
+++ sources 31 May 2010 20:00:20 -0000 1.68
@@ -1,2 +1,3 @@
3fb544ae02fadc2b4085f62bb927e861 squid-3.1.4.tar.bz2
a4abc8a4710d6fc59478293125f027bc squid-3.1.4.tar.bz2.asc
+9601e84f06b7bbe4e44c133f9d0c585f squid-3-10526.patch
Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/F-13/squid.spec,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -p -r1.171 -r1.172
--- squid.spec 30 May 2010 15:05:49 -0000 1.171
+++ squid.spec 31 May 2010 20:00:20 -0000 1.172
@@ -4,7 +4,7 @@
Name: squid
Version: 3.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2
@@ -22,6 +22,7 @@ Source98: perl-requires-squid.sh
# Upstream patches
#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-xxxx.patch
+Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10526.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@@ -69,6 +70,7 @@ lookup program (dnsserver), a program fo
%setup -q
#patch001 -p0 -b .3.1-xxxx
+%patch001 -p0 -b .3-10526
%patch201 -p1 -b .config
%patch202 -p1 -b .location
@@ -259,6 +261,9 @@ fi
%changelog
+* Mon May 31 2010 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 7: 3.1.4-2
+- Correct case-insensitiveness in HTTP list header parsing
+
* Sun May 30 2010 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 7:3.1.4-1
- Upstream 3.1.4 bugfix release, issues relating to IPv6, TPROXY, Memory
management, follow_x_forwarded_for, and stability fixes
13 years, 6 months
rpms/squid/devel .cvsignore, 1.65, 1.66 sources, 1.68, 1.69 squid.spec, 1.175, 1.176
by Henrik Nordström
Author: hno
Update of /cvs/pkgs/rpms/squid/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24691
Modified Files:
.cvsignore sources squid.spec
Log Message:
List header case-insensitiveness bugfix
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/.cvsignore,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- .cvsignore 30 May 2010 13:55:31 -0000 1.65
+++ .cvsignore 31 May 2010 19:59:21 -0000 1.66
@@ -1,2 +1,3 @@
squid-3.1.4.tar.bz2
squid-3.1.4.tar.bz2.asc
+squid-3-10526.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources 30 May 2010 13:55:31 -0000 1.68
+++ sources 31 May 2010 19:59:21 -0000 1.69
@@ -1,2 +1,3 @@
3fb544ae02fadc2b4085f62bb927e861 squid-3.1.4.tar.bz2
a4abc8a4710d6fc59478293125f027bc squid-3.1.4.tar.bz2.asc
+9601e84f06b7bbe4e44c133f9d0c585f squid-3-10526.patch
Index: squid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/squid/devel/squid.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- squid.spec 30 May 2010 13:55:31 -0000 1.175
+++ squid.spec 31 May 2010 19:59:21 -0000 1.176
@@ -4,7 +4,7 @@
Name: squid
Version: 3.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Squid proxy caching server
Epoch: 7
License: GPLv2
@@ -22,6 +22,7 @@ Source98: perl-requires-squid.sh
# Upstream patches
#Patch001: http://www.squid-cache.org/Versions/v3/3.1/changesets/squid-3.1-xxxx.patch
+Patch001: http://www.squid-cache.org/Versions/v3/HEAD/changesets/squid-3-10526.patch
# Local patches
# Applying upstream patches first makes it less likely that local patches
@@ -69,6 +70,7 @@ lookup program (dnsserver), a program fo
%setup -q
#patch001 -p0 -b .3.1-xxxx
+%patch001 -p0 -b .3-10526
%patch201 -p1 -b .config
%patch202 -p1 -b .location
@@ -259,6 +261,9 @@ fi
%changelog
+* Mon May 31 2010 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 7: 3.1.4-2
+- Correct case-insensitiveness in HTTP list header parsing
+
* Sun May 30 2010 Henrik Nordstrom <henrik(a)henriknordstrom.net> - 7:3.1.4-1
- Upstream 3.1.4 bugfix release, issues relating to IPv6, TPROXY, Memory
management, follow_x_forwarded_for, and stability fixes
13 years, 6 months
rpms/gstreamer-plugins-bad-free/F-12 gstreamer-plugins-bad-free.spec, 1.4, 1.5
by Benjamin Otte
Author: company
Update of /cvs/pkgs/rpms/gstreamer-plugins-bad-free/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23922
Modified Files:
gstreamer-plugins-bad-free.spec
Log Message:
forgot to require libvpx
Index: gstreamer-plugins-bad-free.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-bad-free/F-12/gstreamer-plugins-bad-free.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- gstreamer-plugins-bad-free.spec 31 May 2010 19:20:43 -0000 1.4
+++ gstreamer-plugins-bad-free.spec 31 May 2010 19:52:59 -0000 1.5
@@ -62,6 +62,7 @@ BuildRequires: librsvg2-devel
BuildRequires: zbar-devel
BuildRequires: schroedinger-devel
BuildRequires: ladspa-devel
+BuildRequires: libvpx-devel
Obsoletes: gstreamer-plugins-flumpegdemux < 0.10.15-9
Provides: gstreamer-plugins-flumpegdemux = %{version}-%{release}
13 years, 6 months
rpms/openscada/EL-6 .cvsignore, 1.4, 1.5 import.log, 1.13, 1.14 openscada.spec, 1.21, 1.22 sources, 1.4, 1.5
by Popkov Aleksey
Author: aleksey2005
Update of /cvs/pkgs/rpms/openscada/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23942/EL-6
Modified Files:
.cvsignore import.log openscada.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 26 Jan 2010 11:50:07 -0000 1.4
+++ .cvsignore 31 May 2010 19:52:59 -0000 1.5
@@ -1 +1 @@
-openscada-0.6.4.1.tar.gz
+openscada-0.6.4.2.tar.gz
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-6/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- import.log 17 Feb 2010 13:08:35 -0000 1.13
+++ import.log 31 May 2010 19:52:59 -0000 1.14
@@ -11,3 +11,4 @@ openscada-0_6_4_1-4_fc11:F-12:openscada-
openscada-0_6_4_1-5_fc11:F-12:openscada-0.6.4.1-5.fc11.src.rpm:1264584261
openscada-0_6_4_1-8_fc11:F-12:openscada-0.6.4.1-8.fc11.src.rpm:1265286718
openscada-0_6_4_1-9_fc11:F-12:openscada-0.6.4.1-9.fc11.src.rpm:1266412107
+openscada-0_6_4_2-1_fc11:EL-6:openscada-0.6.4.2-1.fc11.src.rpm:1275335678
Index: openscada.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-6/openscada.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- openscada.spec 17 Feb 2010 13:08:35 -0000 1.21
+++ openscada.spec 31 May 2010 19:52:59 -0000 1.22
@@ -15,8 +15,11 @@
%bcond_without logiclevel
%bcond_without daqgate
%bcond_with icpdas
+%bcond_without opcua
+%bcond_with amrdevs
# ======== Protocol ========
%bcond_without selfsystem
+%bcond_without userprotocol
# ========= DATA BASES =====
%bcond_with firebird
%bcond_without mysql
@@ -29,6 +32,7 @@
%bcond_without webcfg
%bcond_without webcfgd
%bcond_without webvision
+%bcond_without webuser
# ========== HTTP Protocol =========
%bcond_without http
# ========== QT Interfaces ==========
@@ -67,8 +71,8 @@
Summary: Open SCADA system project
Name: openscada
-Version: 0.6.4.1
-Release: 9%{?dist}
+Version: 0.6.4.2
+Release: 1%{?dist}
Source0: ftp://oscada.org.ua/OpenSCADA/0.6.4/openscada-%version.tar.gz
# Init scripts for fedora
Patch0: oscada.init.patch
@@ -82,16 +86,13 @@ ExclusiveArch: %{ix86} x86_64
BuildRequires: gettext
BuildRequires: gd-devel
BuildRequires: expat-devel
-BuildRequires: sqlite-devel
BuildRequires: byacc
BuildRequires: bison
-BuildRequires: portaudio-devel
%if 0%{?rhel}
BuildRequires: qt4-devel
%else
BuildRequires: qt-devel
%endif
-BuildRequires: lm_sensors-devel
BuildRequires: openssl-devel
BuildRequires: fftw-devel
BuildRequires: autoconf
@@ -101,6 +102,8 @@ BuildRequires: desktop-file-utils
BuildRequires: sed
BuildRequires: chrpath
BuildRequires: net-snmp-devel
+BuildRequires: glibc-devel
+BuildRequires: gcc-c++
Requires(post): chkconfig
Requires(preun): chkconfig
@@ -202,6 +205,7 @@ Protokolle Modbus/TCP, Modbus/RTU и Mod
%package DAQ-Soundcard
Summary: Open SCADA DAQ
Group: Applications/Engineering
+BuildRequires: portaudio-devel
Requires: %{name} = %{version}-%{release}
%description DAQ-Soundcard
The %name-DAQ-Soundcard allows access to sound card data.
@@ -257,6 +261,7 @@ Protokolls und der Bibliothek Libnodave
%package DAQ-System
Summary: Open SCADA DAQ
Group: Applications/Engineering
+BuildRequires: lm_sensors-devel
Requires: %{name} = %{version}-%{release}
%description DAQ-System
The %name-DAQ-System, allow operation system data acquisition.
@@ -394,6 +399,55 @@ Das Paket %name-Protocol-SelfSystem, das
Protokoll, unterstützt die Hauptfunktionen
%endif
+%if 0%{?with_userprotocol}
+%package Protocol-UserProtocol
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description Protocol-UserProtocol
+The %{name}-Protocol-UserProtocol package - allow creation self-user
+protocols on any OpenSCADA language.
+%description Protocol-UserProtocol -l ru_RU.UTF8
+Пакет %{name}-Protocol-UserProtocol - позволяет создавать
+собственные пользовательские протоколы на любом OpenSCADA языке.
+%description Protocol-UserProtocol -l uk_UA.UTF8
+Пакет %{name}-Protocol-UserProtocol - дозволяє створювати власні
+протоколи користувача на будьякій мові OpenSCADA.
+%description Protocol-UserProtocol -l de_DE.UTF8
+Das Paket %{name}-Protocol-UserProtocol - ermöglicht das Schaffen der
+eigenen Usersprotokolle in jeder OpenSCADA - Sprache.
+%endif
+
+%if 0%{?with_opcua}
+%package DAQ-OpcUa
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-OpcUa
+The %name-DAQ-OpcUa, package allow realisation of OPC UA protocol.
+%description DAQ-OpcUa -l ru_RU.UTF8
+Пакет %name-DAQ-OpcUa, предоставляет реализацию OPC UA протокола.
+%description DAQ-OpcUa -l uk_UA.UTF8
+Пакет %name-DAQ-OpcUa,надає реалізацію OPC UA протокола.
+%description DAQ-OpcUa -l de_DE.UTF8
+Das Paket %name-DAQ-OpcUa gewährt den Einsatz des OPC UA -Protokolls
+%endif
+
+%if 0%{?with_amrdevs}
+%package DAQ-AMRDevs
+Summary: Open SCADA DAQ
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description DAQ-AMRDevs
+The %name-DAQ-AMRDevs.
+%description DAQ-AMRDevs -l ru_RU.UTF8
+Пакет %name-DAQ-AMRDevs.
+%description DAQ-AMRDevs -l uk_UA.UTF8
+Пакет %name-DAQ-AMRDevs.
+%description DAQ-AMRDevs -l de_DE.UTF8
+Das Paket %name-DAQ-AMRDevs.
+%endif
+
########################### BD-System ############################
%if 0%{?with_firebird}
%package DB-FireBird
@@ -450,6 +504,7 @@ Versionen 3.0.
%package DB-SQLite
Summary: Open SCADA bases
Group: Applications/Engineering
+BuildRequires: sqlite-devel
Requires: %{name} = %{version}-%{release}
%description DB-SQLite
The %name-DB-SQLite package allow support of the BD SQLite.
@@ -582,6 +637,25 @@ Das Paket %name-UI-WebVision, web-Arbeit
Ausführung visueller Kontrollebereiche.
%endif
+%if 0%{?with_webuser}
+%package UI-WebUser
+Summary: Open SCADA interfaces
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+%description UI-WebUser
+The %name-UI-WebUser web operation user interface for visual
+control area (VCA) projects playing.
+%description UI-WebUser -l ru_UA.UTF8
+Пакет %name-UI-WebUser, web рабочий пользовательский интерфейс
+для исполнения визуальных сред управления (СВУ)
+%description UI-WebUser -l uk_RU.UTF8
+Пакет %name-UI-WebUser, web робочий інтерфейс користувача для
+виконання візуального середовища керування (СВК).
+%description UI-WebUser -l de_DE.UTF8
+Das Paket %name-UI-WebUser, web Arbeitsnutzersinterface
+%endif
+
+
%if 0%{?with_http}
%package Protocol-HTTP
Summary: Open SCADA http
@@ -912,6 +986,12 @@ Requires:%{name}-DAQ-Gate = %{version}-%
%if 0%{?with_icpdas}
Requires:%{name}-DAQ-IcpDas = %{version}-%{release}
%endif
+%if 0%{?with_opcua}
+Requires:%{name}-DAQ-OpcUa = %{version}-%{release}
+%endif
+%if 0%{?with_amrdevs}
+Requires:%{name}-DAQ-AMRDevs = %{version}-%{release}
+%endif
# ############### HTTP ########################
%if 0%{?with_http}
Requires:%{name}-Protocol-HTTP = %{version}-%{release}
@@ -920,6 +1000,9 @@ Requires:%{name}-Protocol-HTTP = %{versi
%if 0%{?with_selfsystem}
Requires:%{name}-Protocol-SelfSystem = %{version}-%{release}
%endif
+%if 0%{?with_userprotocol}
+Requires:%{name}-Protocol-UserProtocol = %{version}-%{release}
+%endif
# ############### Transport ########################
%if 0%{?with_sockets}
Requires:%{name}-Transport-Sockets = %{version}-%{release}
@@ -953,6 +1036,9 @@ Requires:%{name}-UI-WebCfgd = %{version}
%if 0%{?with_webvision}
Requires:%{name}-UI-WebVision = %{version}-%{release}
%endif
+%if 0%{?with_webuser}
+Requires:%{name}-UI-WebUser = %{version}-%{release}
+%endif
%description demo
The %{name}-demo package includes demo data bases and configs.
For start use command <openscada_demo>. For access use account
@@ -1117,6 +1203,7 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
%{!?with_webcfg:--disable-WebCfg} \
%{!?with_webcfgd:--disable-WebCfgD} \
%{!?with_webvision:--disable-WebVision} \
+%{!?with_webuser:--disable-WebUser} \
%{!?with_http:--disable-HTTP} \
%{!?with_modbus:--disable-ModBus} \
%{!?with_soundcard:--disable-SoundCard} \
@@ -1136,7 +1223,10 @@ CFLAGS="%{optflags}" CXXFLAGS="%{optflag
%{!?with_logiclevel:--disable-LogicLev} \
%{!?with_daqgate:--disable-DAQGate} \
%{!?with_icpdas:--disable-ICP_DAS} \
+%{!?with_opcua:--disable-OPC_UA} \
+%{!?with_amrdevs:--disable-AMRDevs} \
%{!?with_selfsystem:--disable-SelfSystem} \
+%{!?with_userprotocol:--disable-UserProtocol} \
%{!?with_flibcomplex:--disable-FLibComplex1} \
%{!?with_flibmath:--disable-FLibMath} \
%{!?with_flibsys:-disable-FlibSYS} \
@@ -1223,7 +1313,10 @@ desktop-file-install --dir=%{buildroot}%
%{?with_logiclevel: %exclude %{_libdir}/openscada/daq_LogicLev.so}
%{?with_daqgate: %exclude %{_libdir}/openscada/daq_DAQGate.so}
%{?with_icpdas: %exclude %{_libdir}/openscada/daq_ICP_DAS.so}
+%{?with_opcua: %exclude %{_libdir}/openscada/daq_OPC_UA.so}
+%{?with_amrdevs: %exclude %{_libdir}/openscada/daq_AMRDevs.so}
%{?with_selfsystem: %exclude %{_libdir}/openscada/prot_SelfSystem.so}
+%{?with_userprotocol: %exclude %{_libdir}/openscada/prot_UserProtocol.so}
%{?with_firebird: %exclude %{_libdir}/openscada/bd_FireBird.so}
%{?with_mysql: %exclude %{_libdir}/openscada/bd_MySQL.so}
%{?with_dbf: %exclude %{_libdir}/openscada/bd_DBF.so}
@@ -1233,6 +1326,7 @@ desktop-file-install --dir=%{buildroot}%
%{?with_webcfg: %exclude %{_libdir}/openscada/ui_WebCfg.so}
%{?with_webcfgd: %exclude %{_libdir}/openscada/ui_WebCfgD.so}
%{?with_webvision: %exclude %{_libdir}/openscada/ui_WebVision.so}
+%{?with_webuser: %exclude %{_libdir}/openscada/ui_WebUser.so}
%{?with_http: %exclude %{_libdir}/openscada/prot_HTTP.so}
%{?with_qtstarter: %exclude %{_libdir}/openscada/ui_QTStarter.so}
%{?with_qtcfg: %exclude %{_libdir}/openscada/ui_QTCfg.so}
@@ -1336,12 +1430,30 @@ desktop-file-install --dir=%{buildroot}%
%{_libdir}/openscada/daq_ICP_DAS.so
%endif
+%if 0%{?with_opcua}
+%files DAQ-OpcUa
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_OPC_UA.so
+%endif
+
+%if 0%{?with_amrdevs}
+%files DAQ-AMRDevs
+%defattr(-,root,root)
+%{_libdir}/openscada/daq_AMRDevs.so
+%endif
+
%if 0%{?with_selfsystem}
%files Protocol-SelfSystem
%defattr(-,root,root)
%{_libdir}/openscada/prot_SelfSystem.so
%endif
+%if 0%{?with_userprotocol}
+%files Protocol-UserProtocol
+%defattr(-,root,root)
+%{_libdir}/openscada/prot_UserProtocol.so
+%endif
+
%if 0%{?with_firebird}
%files DB-FireBird
%defattr(-,root,root)
@@ -1396,6 +1508,12 @@ desktop-file-install --dir=%{buildroot}%
%{_libdir}/openscada/ui_WebVision.so
%endif
+%if 0%{?with_webuser}
+%files UI-WebUser
+%defattr(-,root,root)
+%{_libdir}/openscada/ui_WebUser.so
+%endif
+
%if 0%{?with_http}
%files Protocol-HTTP
%defattr(-,root,root)
@@ -1489,6 +1607,13 @@ desktop-file-install --dir=%{buildroot}%
%endif
%changelog
+* Mon May 17 2010 Aleksey Popkov <aleksey(a)oscada.org> - 0.6.4.2-1
+- RPM-build speck files is changed for build version 0.6.4.2 packages
+- Adding the module to self package of OPC_UA
+- Adding the module to self package of WebUser
+- Adding the module to self package of UserProtocol
+- Disabled the module AMRDevs (not tested).
+
* Wed Feb 17 2010 Aleksey Popkov <aleksey(a)oscada.org.ua> - 0.6.4.1-9
- Fixed of dependencies in Obsoletes directives
- Change of Source0 url path.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openscada/EL-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 26 Jan 2010 11:50:07 -0000 1.4
+++ sources 31 May 2010 19:52:59 -0000 1.5
@@ -1 +1 @@
-bbe6f8ec2978c205abb7671fec465c84 openscada-0.6.4.1.tar.gz
+c5862837c2b150f28696cf96f6b2cfb6 openscada-0.6.4.2.tar.gz
13 years, 6 months
rpms/gstreamer-plugins-good/F-12 gstreamer-plugins-good.spec, 1.120, 1.121
by Benjamin Otte
Author: company
Update of /cvs/pkgs/rpms/gstreamer-plugins-good/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23563
Modified Files:
gstreamer-plugins-good.spec
Log Message:
remove obsolete files
Index: gstreamer-plugins-good.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-good/F-12/gstreamer-plugins-good.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- gstreamer-plugins-good.spec 31 May 2010 19:24:42 -0000 1.120
+++ gstreamer-plugins-good.spec 31 May 2010 19:51:25 -0000 1.121
@@ -162,7 +162,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstsmpte.so
%{_libdir}/gstreamer-%{majorminor}/libgstudp.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideobox.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideoflip.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideomixer.so
%{_libdir}/gstreamer-%{majorminor}/libgstwavenc.so
%{_libdir}/gstreamer-%{majorminor}/libgstwavparse.so
@@ -170,9 +169,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/gstreamer-%{majorminor}/libgstapetag.so
%{_libdir}/gstreamer-%{majorminor}/libgstannodex.so
%{_libdir}/gstreamer-%{majorminor}/libgsticydemux.so
-%{_libdir}/gstreamer-%{majorminor}/libgstvideobalance.so
%{_libdir}/gstreamer-%{majorminor}/libgstximagesrc.so
-%{_libdir}/gstreamer-%{majorminor}/libgstgamma.so
%{_libdir}/gstreamer-%{majorminor}/libgstqtdemux.so
%{_libdir}/gstreamer-%{majorminor}/libgstvideocrop.so
%{_libdir}/gstreamer-%{majorminor}/libgstequalizer.so
13 years, 6 months
rpms/postgresql-jdbc/devel postgresql-jdbc.spec,1.22,1.23
by Tom Lane
Author: tgl
Update of /cvs/pkgs/rpms/postgresql-jdbc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22569
Modified Files:
postgresql-jdbc.spec
Log Message:
Fix FTBFS due to obsolete gcj BuildRequires
Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-jdbc/devel/postgresql-jdbc.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- postgresql-jdbc.spec 5 Jan 2010 17:13:54 -0000 1.22
+++ postgresql-jdbc.spec 31 May 2010 19:43:44 -0000 1.23
@@ -38,7 +38,7 @@
Summary: JDBC driver for PostgreSQL
Name: postgresql-jdbc
Version: 8.4.701
-Release: 3%{?dist}
+Release: 4%{?dist}
# ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
License: BSD and ASL 2.0
Group: Applications/Databases
@@ -60,9 +60,9 @@ BuildRequires: findutils
# gettext is only needed if we try to update translations
#BuildRequires: gettext
%if %{gcj_support}
-BuildRequires: gcc-java
-Requires(post): /usr/bin/rebuild-gcj-db
-Requires(postun): /usr/bin/rebuild-gcj-db
+BuildRequires: java-gcj-compat-devel >= 1.0.31
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
%endif
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
@@ -116,7 +116,7 @@ ln -s postgresql-jdbc.jar postgresql-jdb
popd
%if %{gcj_support}
-aot-compile-rpm
+%{_bindir}/aot-compile-rpm
%endif
# Install the pom after inserting the correct version number
@@ -128,16 +128,22 @@ install -m 644 JPP-postgresql-jdbc.pom $
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{gcj_support}
-
%post
-/usr/bin/rebuild-gcj-db
%update_maven_depmap
+%if %{gcj_support}
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+ then
+ %{_bindir}/rebuild-gcj-db
+ fi
+%endif
%postun
-/usr/bin/rebuild-gcj-db
%update_maven_depmap
-
+%if %{gcj_support}
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+ then
+ %{_bindir}/rebuild-gcj-db
+ fi
%endif
%files
@@ -145,14 +151,16 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE README doc/*
%{_javadir}/*
%if %{gcj_support}
-%dir %{_libdir}/gcj/%{name}
-%{_libdir}/gcj/%{name}/*.jar.so
-%{_libdir}/gcj/%{name}/*.jar.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}
%endif
%{_sysconfdir}/maven/fragments/%{name}
%{_datadir}/maven2/poms/JPP-%{name}.pom
%changelog
+* Mon May 31 2010 Tom Lane <tgl(a)redhat.com> 8.4.701-4
+- Update gcj_support sections to meet Packaging/GCJGuidelines;
+ fixes FTBFS in F-14 rawhide
+
* Tue Nov 24 2009 Tom Lane <tgl(a)redhat.com> 8.4.701-3
- Seems the .pom file *must* have a package version number in it, sigh
Resolves: #538487
13 years, 6 months