rpms/gnome-shell-extension-weather/F-18 .cvsignore, 1.11, 1.12 gnome-shell-extension-weather.spec, 1.11, 1.12 sources, 1.11, 1.12
by Mattia Meneguzzo
Author: odysseus
Update of /cvs/free/rpms/gnome-shell-extension-weather/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23542
Modified Files:
.cvsignore gnome-shell-extension-weather.spec sources
Log Message:
* Sun Apr 21 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.12.git1f8dfbf
- Update to latest upstream version
- Update ".spec" file
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/F-18/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 12 Jan 2013 11:04:53 -0000 1.11
+++ .cvsignore 21 Apr 2013 09:42:23 -0000 1.12
@@ -1 +1 @@
-Neroth-gnome-shell-extension-weather-f4fa5d1.tar.gz
+Neroth-gnome-shell-extension-weather-1f8dfbf.tar.gz
Index: gnome-shell-extension-weather.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/F-18/gnome-shell-extension-weather.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-shell-extension-weather.spec 12 Jan 2013 11:04:54 -0000 1.11
+++ gnome-shell-extension-weather.spec 21 Apr 2013 09:42:23 -0000 1.12
@@ -1,11 +1,11 @@
-%global git f4fa5d1
-%global uuid weather(a)gnome-shell-extensions.gnome.org
+%global git 1f8dfbf
+%global uuid weather-extension(a)xeked.com
%global github Neroth-gnome-shell-extension-weather
%global checkout git%{git}
Name: gnome-shell-extension-weather
Version: 0
-Release: 0.11.%{checkout}%{?dist}
+Release: 0.12.%{checkout}%{?dist}
Summary: An extension for displaying weather notifications in GNOME Shell
Group: User Interface/Desktops
@@ -14,7 +14,7 @@
Source0: https://github.com/Neroth/gnome-shell-extension-weather/tarball/master/%{...
BuildArch: noarch
-BuildRequires: autoconf >= 2.53, automake >= 1.9, desktop-file-utils, glib2-devel, gnome-common >= 3.4.0, intltool >= 0.25
+BuildRequires: autoconf >= 2.53, automake >= 1.9, glib2-devel, gnome-common >= 3.4.0, intltool >= 0.25
Requires: gnome-shell >= 3.4.0
%description
@@ -34,7 +34,6 @@
%install
make install DESTDIR=%{buildroot}
%find_lang %{name}
-desktop-file-install --add-category="GNOME" --remove-category="System" --delete-original --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/weather-settings.desktop
%postun
if [ $1 -eq 0 ] ; then
@@ -45,12 +44,15 @@
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f %{name}.lang
-%doc AUTHORS COPYING NEWS README
-%{_datadir}/applications/weather-settings.desktop
+%doc AUTHORS COPYING README.md
%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.weather.gschema.xml
%{_datadir}/gnome-shell/extensions/%{uuid}/
%changelog
+* Sun Apr 21 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.12.git1f8dfbf
+- Update to latest upstream version
+- Update ".spec" file
+
* Sat Jan 12 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.11.gitf4fa5d1
- Update to latest upstream version
- Update requirements
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Jan 2013 11:04:54 -0000 1.11
+++ sources 21 Apr 2013 09:42:24 -0000 1.12
@@ -1 +1 @@
-d9e20720c15bc401d5bef77e5c6db2ca Neroth-gnome-shell-extension-weather-f4fa5d1.tar.gz
+4fc4d573301dc38a954fbc8b42fd703b Neroth-gnome-shell-extension-weather-1f8dfbf.tar.gz
11 years, 1 month
rpms/gnome-shell-extension-weather/F-17 .cvsignore, 1.11, 1.12 gnome-shell-extension-weather.spec, 1.11, 1.12 sources, 1.11, 1.12
by Mattia Meneguzzo
Author: odysseus
Update of /cvs/free/rpms/gnome-shell-extension-weather/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23361
Modified Files:
.cvsignore gnome-shell-extension-weather.spec sources
Log Message:
* Sun Apr 21 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.12.git1f8dfbf
- Update to latest upstream version
- Update ".spec" file
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/F-17/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 12 Jan 2013 11:02:53 -0000 1.11
+++ .cvsignore 21 Apr 2013 09:39:01 -0000 1.12
@@ -1 +1 @@
-Neroth-gnome-shell-extension-weather-f4fa5d1.tar.gz
+Neroth-gnome-shell-extension-weather-1f8dfbf.tar.gz
Index: gnome-shell-extension-weather.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/F-17/gnome-shell-extension-weather.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-shell-extension-weather.spec 12 Jan 2013 11:02:53 -0000 1.11
+++ gnome-shell-extension-weather.spec 21 Apr 2013 09:39:01 -0000 1.12
@@ -1,11 +1,11 @@
-%global git f4fa5d1
-%global uuid weather(a)gnome-shell-extensions.gnome.org
+%global git 1f8dfbf
+%global uuid weather-extension(a)xeked.com
%global github Neroth-gnome-shell-extension-weather
%global checkout git%{git}
Name: gnome-shell-extension-weather
Version: 0
-Release: 0.11.%{checkout}%{?dist}
+Release: 0.12.%{checkout}%{?dist}
Summary: An extension for displaying weather notifications in GNOME Shell
Group: User Interface/Desktops
@@ -14,7 +14,7 @@
Source0: https://github.com/Neroth/gnome-shell-extension-weather/tarball/master/%{...
BuildArch: noarch
-BuildRequires: autoconf >= 2.53, automake >= 1.9, desktop-file-utils, glib2-devel, gnome-common >= 3.4.0, intltool >= 0.25
+BuildRequires: autoconf >= 2.53, automake >= 1.9, glib2-devel, gnome-common >= 3.4.0, intltool >= 0.25
Requires: gnome-shell >= 3.4.0
%description
@@ -34,7 +34,6 @@
%install
make install DESTDIR=%{buildroot}
%find_lang %{name}
-desktop-file-install --add-category="GNOME" --remove-category="System" --delete-original --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/weather-settings.desktop
%postun
if [ $1 -eq 0 ] ; then
@@ -45,12 +44,15 @@
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f %{name}.lang
-%doc AUTHORS COPYING NEWS README
-%{_datadir}/applications/weather-settings.desktop
+%doc AUTHORS COPYING README.md
%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.weather.gschema.xml
%{_datadir}/gnome-shell/extensions/%{uuid}/
%changelog
+* Sun Apr 21 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.12.git1f8dfbf
+- Update to latest upstream version
+- Update ".spec" file
+
* Sat Jan 12 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.11.gitf4fa5d1
- Update to latest upstream version
- Update requirements
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Jan 2013 11:02:54 -0000 1.11
+++ sources 21 Apr 2013 09:39:01 -0000 1.12
@@ -1 +1 @@
-d9e20720c15bc401d5bef77e5c6db2ca Neroth-gnome-shell-extension-weather-f4fa5d1.tar.gz
+4fc4d573301dc38a954fbc8b42fd703b Neroth-gnome-shell-extension-weather-1f8dfbf.tar.gz
11 years, 1 month
rpms/gnome-shell-extension-weather/devel .cvsignore, 1.11, 1.12 gnome-shell-extension-weather.spec, 1.11, 1.12 sources, 1.11, 1.12
by Mattia Meneguzzo
Author: odysseus
Update of /cvs/free/rpms/gnome-shell-extension-weather/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22948
Modified Files:
.cvsignore gnome-shell-extension-weather.spec sources
Log Message:
* Sun Apr 21 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.12.git1f8dfbf
- Update to latest upstream version
- Update ".spec" file
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 12 Jan 2013 10:55:58 -0000 1.11
+++ .cvsignore 21 Apr 2013 09:32:00 -0000 1.12
@@ -1 +1 @@
-Neroth-gnome-shell-extension-weather-f4fa5d1.tar.gz
+Neroth-gnome-shell-extension-weather-1f8dfbf.tar.gz
Index: gnome-shell-extension-weather.spec
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/devel/gnome-shell-extension-weather.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-shell-extension-weather.spec 12 Jan 2013 10:55:59 -0000 1.11
+++ gnome-shell-extension-weather.spec 21 Apr 2013 09:32:00 -0000 1.12
@@ -1,11 +1,11 @@
-%global git f4fa5d1
-%global uuid weather(a)gnome-shell-extensions.gnome.org
+%global git 1f8dfbf
+%global uuid weather-extension(a)xeked.com
%global github Neroth-gnome-shell-extension-weather
%global checkout git%{git}
Name: gnome-shell-extension-weather
Version: 0
-Release: 0.11.%{checkout}%{?dist}
+Release: 0.12.%{checkout}%{?dist}
Summary: An extension for displaying weather notifications in GNOME Shell
Group: User Interface/Desktops
@@ -14,7 +14,7 @@
Source0: https://github.com/Neroth/gnome-shell-extension-weather/tarball/master/%{...
BuildArch: noarch
-BuildRequires: autoconf >= 2.53, automake >= 1.9, desktop-file-utils, glib2-devel, gnome-common >= 3.4.0, intltool >= 0.25
+BuildRequires: autoconf >= 2.53, automake >= 1.9, glib2-devel, gnome-common >= 3.4.0, intltool >= 0.25
Requires: gnome-shell >= 3.4.0
%description
@@ -34,7 +34,6 @@
%install
make install DESTDIR=%{buildroot}
%find_lang %{name}
-desktop-file-install --add-category="GNOME" --remove-category="System" --delete-original --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/weather-settings.desktop
%postun
if [ $1 -eq 0 ] ; then
@@ -45,12 +44,15 @@
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%files -f %{name}.lang
-%doc AUTHORS COPYING NEWS README
-%{_datadir}/applications/weather-settings.desktop
+%doc AUTHORS COPYING README.md
%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.weather.gschema.xml
%{_datadir}/gnome-shell/extensions/%{uuid}/
%changelog
+* Sun Apr 21 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.12.git1f8dfbf
+- Update to latest upstream version
+- Update ".spec" file
+
* Sat Jan 12 2013 Mattia Meneguzzo <odysseus(a)fedoraproject.org> - 0-0.11.gitf4fa5d1
- Update to latest upstream version
- Update requirements
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gnome-shell-extension-weather/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Jan 2013 10:55:59 -0000 1.11
+++ sources 21 Apr 2013 09:32:00 -0000 1.12
@@ -1 +1 @@
-d9e20720c15bc401d5bef77e5c6db2ca Neroth-gnome-shell-extension-weather-f4fa5d1.tar.gz
+4fc4d573301dc38a954fbc8b42fd703b Neroth-gnome-shell-extension-weather-1f8dfbf.tar.gz
11 years, 1 month
rpms/motion/devel motion.spec,1.27,1.28
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4310
Modified Files:
motion.spec
Log Message:
bump release
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- motion.spec 20 Apr 2013 14:53:28 -0000 1.27
+++ motion.spec 20 Apr 2013 14:54:10 -0000 1.28
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.7%{?dist}
+Release: trunkREV557.8%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
11 years, 1 month
rpms/motion/devel motion.tmpfiles, NONE, 1.1 motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch, 1.1, 1.2 motion.service, 1.1, 1.2 motion.spec, 1.26, 1.27
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4216
Modified Files:
motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
motion.service motion.spec
Added Files:
motion.tmpfiles
Log Message:
* Sat Apr 20 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.8
- migrate from running as root to running as motion:video (fixes #1935)
- don't ship INSTALL file
--- NEW FILE motion.tmpfiles ---
# Type Path Mode UID GID Age Argument
#
# home directory for motion
d /run/motion 0700 motion video - -
# create logfile if does not exists
f /var/log/motion.log 0600 motion video - -
motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch:
motion.logrotate | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Index: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch 19 Apr 2013 10:57:01 -0000 1.1
+++ motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch 20 Apr 2013 14:53:27 -0000 1.2
@@ -16,7 +16,7 @@
create 0600 root root
postrotate
- /bin/service motion reload >/dev/null 2>&1 || true
-+ /usr/bin systemctl reload-or-try-restart motion.service >/dev/null 2>&1 || true
++ /usr/bin/systemctl reload-or-try-restart motion.service >/dev/null 2>&1 || true
endscript
}
--
Index: motion.service
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- motion.service 19 Apr 2013 11:23:38 -0000 1.1
+++ motion.service 20 Apr 2013 14:53:28 -0000 1.2
@@ -3,6 +3,8 @@
Documentation=man:motion(1) http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome
[Service]
+User=motion
+Group=video
# There's no way to do it automatically, sadly
# if you have problems with your camera, uncomment one of those
# for PPC64 and X86_64:
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- motion.spec 19 Apr 2013 12:07:00 -0000 1.26
+++ motion.spec 20 Apr 2013 14:53:28 -0000 1.27
@@ -8,6 +8,7 @@
URL: http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: motion.service
+Source2: motion.tmpfiles
Patch0: motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch
Patch1: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +18,7 @@
BuildRequires: systemd-units
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
Requires: libv4l
+Requires(pre): shadow-utils
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
@@ -47,6 +49,8 @@
#We move the logrotate configuration
mkdir %{buildroot}%{_sysconfdir}/logrotate.d
mv %{_builddir}/%{name}-%{version}/motion.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/motion
+#We run as motion:video user, reflect that in logrotate config
+sed -i 's|create 0600 root root|create 0600 motion video|g' %{buildroot}%{_sysconfdir}/logrotate.d/motion
#We change the PID file path to match the one in the startup script
sed -i 's|/var/run/motion/motion.pid|/var/run/motion.pid|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We remove SQL directives in the configuration file, as we don't use them
@@ -60,8 +64,17 @@
sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We install our startup script
install -D -m 0755 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+#We install tmpfiles configuration
+install -D -m 0755 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+
+%pre
+getent passwd motion >/dev/null || \
+ useradd -r -g video -d /run/motion -s /sbin/nologin \
+ -c "motion detection system" motion
+exit 0
%post
+/usr/bin/systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf
%systemd_post %{name}.service
%preun
@@ -70,6 +83,12 @@
%postun
%systemd_postun_with_restart %{name}.service
+%triggerun -- motion < 3.3.0-trunkREV557.8
+# we never shipped /var/motion directory, but it was set as
+# default target_dir in config file. Be nice to admin and migrate
+# ownership at the same time as we switch to running as user
+find /var/motion -user root -group root -exec chown motion:video '{}' ';'
+
%clean
rm -rf %{buildroot}
@@ -79,7 +98,7 @@
%dir %{_sysconfdir}/%{name}
%dir %{_datadir}/%{name}-%{version}
%dir %{_datadir}/%{name}-%{version}/examples
-%doc CHANGELOG COPYING CREDITS INSTALL README motion_guide.html
+%doc CHANGELOG COPYING CREDITS README motion_guide.html
%attr(0644,root,root) %{_datadir}/%{name}-%{version}/examples/motion-dist.conf
%attr(0755,root,root) %{_datadir}/%{name}-%{version}/examples/motion.init-Debian
%attr(0755,root,root) %{_datadir}/%{name}-%{version}/examples/motion.init-FreeBSD.sh
@@ -93,8 +112,13 @@
%attr(0755,root,root) %{_bindir}/motion
%attr(0644,root,root) %{_mandir}/man1/motion.1*
%attr(0755,root,root) %{_unitdir}/%{name}.service
+%attr(0755,root,root) %{_tmpfilesdir}/%{name}.conf
%changelog
+* Sat Apr 20 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.8
+- migrate from running as root to running as motion:video (fixes #1935)
+- don't ship INSTALL file
+
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.7
- re-introduce ffmpeg-compat-devel
11 years, 1 month
rpms/VirtualBox-kmod/F-18 VirtualBox-kmod.spec,1.39,1.40
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24927
Modified Files:
VirtualBox-kmod.spec
Log Message:
Rebuilt for current
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-18/VirtualBox-kmod.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- VirtualBox-kmod.spec 18 Apr 2013 07:05:55 -0000 1.39
+++ VirtualBox-kmod.spec 20 Apr 2013 09:59:37 -0000 1.40
@@ -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
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.2.12
-Release: 1%{?prerel:.%{prerel}}%{?dist}.1
+Release: 1%{?prerel:.%{prerel}}%{?dist}.2
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Sat Apr 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.12-1.2
+- Rebuilt for current
+
* Thu Apr 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.2.12-1.1
- Rebuilt for kernel
11 years, 1 month
rpms/motion/F-19 motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch, NONE, 1.1 motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch, NONE, 1.1 motion.spec, 1.21, 1.22
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8903
Modified Files:
motion.spec
Added Files:
motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch
motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
Log Message:
add patches
motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch:
ffmpeg.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch ---
>From dcb186cb3ad6666d66aba6453031203ba1f6c15a Mon Sep 17 00:00:00 2001
From: Tomasz Torcz <tomek(a)pipebreaker.pl>
Date: Mon, 3 Dec 2012 14:25:50 +0100
Subject: [PATCH] emit asm "emms" only on x86 and amd64 arches
Fixes compilation error on ARM:
armv5tel - Error: bad instruction `emms`
---
ffmpeg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 1c2ae47..57eeda4 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1000,7 +1000,7 @@ void ffmpeg_deinterlace(unsigned char *img, int width, int height)
/* We assume using 'PIX_FMT_YUV420P' always */
avpicture_deinterlace(&picture, &picture, PIX_FMT_YUV420P, width, height);
-#ifndef __SSE_MATH__
+#if !defined(__SSE_MATH__) && (defined(__i386__) || defined(__x86_64__))
__asm__ __volatile__ ( "emms");
#endif
--
1.7.11.7
motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch:
motion.logrotate | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch ---
>From 0e81a85851b9c4aa495b2dd697120df5ca53d660 Mon Sep 17 00:00:00 2001
From: Tomasz Torcz <tomek(a)pipebreaker.pl>
Date: Sat, 8 Dec 2012 10:38:42 +0100
Subject: [PATCH] there is no "/bin/service" in Fedora, use systemctl
---
motion.logrotate | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/motion.logrotate b/motion.logrotate
index b97f2f3..75ad7c2 100644
--- a/motion.logrotate
+++ b/motion.logrotate
@@ -5,6 +5,6 @@
size 10M
create 0600 root root
postrotate
- /bin/service motion reload >/dev/null 2>&1 || true
+ /usr/bin systemctl reload-or-try-restart motion.service >/dev/null 2>&1 || true
endscript
}
--
1.8.0.1
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- motion.spec 19 Apr 2013 12:22:32 -0000 1.21
+++ motion.spec 19 Apr 2013 12:25:03 -0000 1.22
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.7%{?dist}
+Release: trunkREV557.7.1%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -95,6 +95,9 @@
%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.7.1
+- add patches
+
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.7
- re-introduce ffmpeg-compat-devel
11 years, 1 month
rpms/motion/F-19 motion.service,NONE,1.1 motion.spec,1.20,1.21
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8655
Modified Files:
motion.spec
Added Files:
motion.service
Log Message:
sync with rawhide
--- NEW FILE motion.service ---
[Unit]
Description=motion detection system
Documentation=man:motion(1) http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome
[Service]
# There's no way to do it automatically, sadly
# if you have problems with your camera, uncomment one of those
# for PPC64 and X86_64:
#Environment=LD_PRELOAD=/usr/lib64/libv4l/v4l2convert.so
# for 32bit archs:
#Environment=LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so
ExecStart=/usr/bin/motion -n
ExecReload=/bin/kill -HUP $MAINPID
PrivateTmp=yes
[Install]
WantedBy=multi-user.target
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/F-19/motion.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- motion.spec 20 Mar 2013 22:40:45 -0000 1.20
+++ motion.spec 19 Apr 2013 12:22:32 -0000 1.21
@@ -1,21 +1,25 @@
Name: motion
Version: 3.3.0
-Release: trunkREV534%{?dist}.7
+Release: trunkREV557.7%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1: motion.service
+Patch0: motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch
+Patch1: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel
Buildrequires: pkgconfig(sqlite3)
+BuildRequires: systemd-units
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
Requires: libv4l
-Requires(post): chkconfig
-Requires(preun): chkconfig initscripts
-Requires(postun): initscripts
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%description
Motion is a software motion detector. It grabs images from video4linux devices
@@ -27,6 +31,8 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
@@ -53,24 +59,16 @@
sed -i 's|;logfile /tmp/motion.log|logfile /var/log/motion.log|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
sed -i 's|target_dir /usr/local/apache2/htdocs/cam1|target_dir /var/motion|g' %{buildroot}%{_sysconfdir}/%{name}/motion.conf
#We install our startup script
-install -D -m 0755 motion.init-Fedora %{buildroot}%{_initrddir}/%{name}
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
%post
-#We add the motion init script to the services when installing
-/sbin/chkconfig --add %{name}
+%systemd_post %{name}.service
%preun
-#We stop the service and remove it from init scripts when erasing
-if [ $1 = 0 ] ; then
- /sbin/service %{name} stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}
-fi
+%systemd_preun %{name}.service
%postun
-#We restart the service during an upgrade
-if [ "$1" -ge "1" ] ; then
- /sbin/service %{name} condrestart >/dev/null 2>&1
-fi
+%systemd_postun_with_restart %{name}.service
%clean
rm -rf %{buildroot}
@@ -94,9 +92,31 @@
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/motion.conf
%attr(0755,root,root) %{_bindir}/motion
%attr(0644,root,root) %{_mandir}/man1/motion.1*
-%attr(0755,root,root) %{_initrddir}/%{name}
+%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.7
+- re-introduce ffmpeg-compat-devel
+
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.6
+- drop changelog entries before 2012 from .spec; dates were wrong and build failed
+- drop changelog entries before 2012 from .spec; dates were wrong and build failed
+
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.5
+- bump again; I hate CVS
+
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.4
+- add missing unit file and bump rel
+
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.3
+- migrate to systemd unit file
+
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.2
+ - synchronize with F-18 version:
+ - patches for ARM compilation and newest ffmpeg
+ (this undoes ffmpeg-compat support)
+ - logrotate fixes
+
* Wed Mar 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.7
- Move to ffmpeg-compat support
- Add sqlite3
@@ -119,59 +139,3 @@
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Sat Oct 01 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV534
-- Add ffmpeg 0.8 compatibility
-
-* Mon Sep 06 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV533
-- Fix log rotation again
-
-* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV532
-- Fix log rotation and also add compression to it
-
-* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.2.20110810trunkREV531
-- Corrects rpmfusion bugs 1878, 1879 and 1880
-
-* Thu May 31 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.1.20110531trunkREV528
-- Early 3.3 version taken from SVN to work with 2.6.38+ kernels
-
-* Thu Mar 06 2010 Steven Moix <steven.moix(a)axianet.ch> - 3.2.12-1
-- New upstream release, important bugfixes only
-
-* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11.1-3
-- rebuild for new ffmpeg
-
-* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
-- Drop patch for ffmpeg 0.5 compatibility
-- Drop ffmpeg detection patch
-- Moved default output directory to /var/motion
-- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
-- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
-- Fix fd leaks in external pipe
-- Avoid possible stack smashing in v4l_open_vidpipe()
-- Fix segfault for new libjpeg v7
-
-* Mon Jul 06 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-1
-- SPEC Preparation for the 3.3 branch
-
-* Sun Jun 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
-- Patch and rebuild for ffmpeg 0.5
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11-4
-- rebuild for new F11 features
-
-* Wed Mar 18 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-3
-- Even more corrected init script thanks to Stewart Adam
-
-* Sun Mar 15 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-2
-- Removed the ffmpeg requires
-- Corrected the spec file
-- New init script with a corrected start() function and LSB header support
-
-* Tue Mar 03 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-1
-- Updated to Fedora 10 standard
-
-* Sun Sep 18 2005 Kenneth Lavrsen <kenneth(a)lavrsen.dk> - 3.2.4-1
-- Generic version of livna spec file replacing the old less optimal specfile.
-
-* Thu Sep 15 2005 Dams <anvil[AT]livna.org> - 3.2.3-0.lvn.1
-- Initial released based upon upstream spec file
11 years, 1 month
rpms/motion/devel motion.spec,1.25,1.26
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7858
Modified Files:
motion.spec
Log Message:
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.7
- re-introduce ffmpeg-compat-devel
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- motion.spec 19 Apr 2013 11:45:16 -0000 1.25
+++ motion.spec 19 Apr 2013 12:07:00 -0000 1.26
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.6%{?dist}
+Release: trunkREV557.7%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -12,7 +12,7 @@
Patch1: motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
+BuildRequires: libjpeg-devel ffmpeg-compat-devel zlib-devel
Buildrequires: pkgconfig(sqlite3)
BuildRequires: systemd-units
#This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
@@ -35,6 +35,7 @@
%patch1 -p1
%build
+export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
make %{?_smp_mflags}
@@ -94,8 +95,12 @@
%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.7
+- re-introduce ffmpeg-compat-devel
+
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.6
- drop changelog entries before 2012 from .spec; dates were wrong and build failed
+- drop changelog entries before 2012 from .spec; dates were wrong and build failed
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.5
- bump again; I hate CVS
11 years, 1 month
rpms/motion/devel motion.spec,1.24,1.25
by Tomasz Torcz
Author: ttorcz
Update of /cvs/free/rpms/motion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6831
Modified Files:
motion.spec
Log Message:
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.6
- drop changelog entries before 2012 from .spec; dates were wrong and build failed
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- motion.spec 19 Apr 2013 11:28:39 -0000 1.24
+++ motion.spec 19 Apr 2013 11:45:16 -0000 1.25
@@ -1,6 +1,6 @@
Name: motion
Version: 3.3.0
-Release: trunkREV557.5%{?dist}
+Release: trunkREV557.6%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -94,6 +94,9 @@
%attr(0755,root,root) %{_unitdir}/%{name}.service
%changelog
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.6
+- drop changelog entries before 2012 from .spec; dates were wrong and build failed
+
* Fri Apr 19 2013 Tomasz Torcz <ttorcz(a)fedoraproject.org> - 3.3.0-trunkREV557.5
- bump again; I hate CVS
@@ -131,59 +134,3 @@
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3.0-trunkREV534.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-* Sat Oct 01 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV534
-- Add ffmpeg 0.8 compatibility
-
-* Mon Sep 06 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV533
-- Fix log rotation again
-
-* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-trunkREV532
-- Fix log rotation and also add compression to it
-
-* Mon Aug 10 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.2.20110810trunkREV531
-- Corrects rpmfusion bugs 1878, 1879 and 1880
-
-* Thu May 31 2011 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-0.1.20110531trunkREV528
-- Early 3.3 version taken from SVN to work with 2.6.38+ kernels
-
-* Thu Mar 06 2010 Steven Moix <steven.moix(a)axianet.ch> - 3.2.12-1
-- New upstream release, important bugfixes only
-
-* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11.1-3
-- rebuild for new ffmpeg
-
-* Tue Aug 11 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11.1-1
-- Drop patch for ffmpeg 0.5 compatibility
-- Drop ffmpeg detection patch
-- Moved default output directory to /var/motion
-- New startup script with added v4l2convert to support more cameras - https://bugzilla.rpmfusion.org/show_bug.cgi?id=681
-- Fix Segfault on reload or quit for vloopback (maybe other v4l1 devices too)
-- Fix fd leaks in external pipe
-- Avoid possible stack smashing in v4l_open_vidpipe()
-- Fix segfault for new libjpeg v7
-
-* Mon Jul 06 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.3.0-1
-- SPEC Preparation for the 3.3 branch
-
-* Sun Jun 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
-- Patch and rebuild for ffmpeg 0.5
-
-* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11-4
-- rebuild for new F11 features
-
-* Wed Mar 18 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-3
-- Even more corrected init script thanks to Stewart Adam
-
-* Sun Mar 15 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-2
-- Removed the ffmpeg requires
-- Corrected the spec file
-- New init script with a corrected start() function and LSB header support
-
-* Tue Mar 03 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-1
-- Updated to Fedora 10 standard
-
-* Sun Sep 18 2005 Kenneth Lavrsen <kenneth(a)lavrsen.dk> - 3.2.4-1
-- Generic version of livna spec file replacing the old less optimal specfile.
-
-* Thu Sep 15 2005 Dams <anvil[AT]livna.org> - 3.2.3-0.lvn.1
-- Initial released based upon upstream spec file
11 years, 1 month