new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7983 ec354946-7b23-47d6-9f5a-488ba84defc7

C/ConsoleKit/ConsoleKit-vl.spec

@@ -6,18 +6,16 @@
 Summary: System daemon for tracking users, sessions and seats
 Summary(ja): ユーザ、セッションおよび座席を捕捉するシステムデーモン
 Name: ConsoleKit
-Version: 0.4.5
-Release: 3%{?_dist_release}
+Version: 0.4.6
+Release: 1%{?_dist_release}
 License: GPLv2+
 Group: System Environment/Daemons
 URL: http://www.freedesktop.org/wiki/Software/ConsoleKit
 
-Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.bz2
+Source0: http://people.freedesktop.org/~mccann/dist/ConsoleKit-%{version}.tar.xz
 # Convert to new upstart syntax
 Patch0: ConsoleKit-0.4.1-upstart06.patch
 
-Patch1:	ConsoleKit-0.4.5-git20120320.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -98,7 +96,6 @@ Developer documentation for ConsoleKit.
 %prep
 %setup -q
 %patch0 -p1 -b .upstart06
-%patch1 -p1
 
 %build
 autoreconf -i -f
@@ -199,6 +196,10 @@ fi
 
 
 %changelog
+* Sun Nov 10 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.4.6-1
+- new upstream release
+- remove Patch1 (ConsoleKit-0.4.5-git20120320.patch)
+
 * Sat Nov 03 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 0.4.5-3
 - add "--enable-udev-acl" option
 - add BR: libudev-devel, libacl-devel

I/ImageMagick/ImageMagick-vl.spec

@@ -1,8 +1,8 @@
 # ImageMagick has adopted a new Version.Patchlevel version numbering system...
 # 6.2.9.7 is actually version 6.2.9, Patchlevel 0.
 
-%define VER 6.8.6
-%define Patchlevel 8
+%define VER 6.8.7
+%define Patchlevel 5
 
 Name: ImageMagick
 Summary: X application for displaying and manipulating images.
@@ -254,7 +254,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.so*
 # remove *.la files
 find $RPM_BUILD_ROOT%{_libdir} -name "lib*.la" |xargs rm -f
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{VER}
+rm -rf $RPM_BUILD_ROOT%{_docdir}/ImageMagick-6
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -272,15 +272,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc www images
 %doc ChangeLog LICENSE NOTICE QuickStart.txt README.txt NEWS.txt index.html
-%dir %{_libdir}/ImageMagick-%{VER}
-%dir %{_libdir}/ImageMagick-%{VER}/modules-Q16
-%dir %{_libdir}/ImageMagick-%{VER}/modules-Q16/*
-%{_libdir}/ImageMagick-%{VER}/modules-Q16/*/*.so
-%{_libdir}/ImageMagick-%{VER}/modules-Q16/*/*.la
-%{_libdir}/libMagick++-6.Q16.so.*
+%dir %{_libdir}/%{name}-%{VER}
+%dir %{_libdir}/%{name}-%{VER}/config-Q16
+%dir %{_libdir}/%{name}-%{VER}/modules-Q16
+%dir %{_libdir}/%{name}-%{VER}/modules-Q16/*
+%{_sysconfdir}/%{name}-6/*.xml
+%{_libdir}/%{name}-%{VER}/config-Q16/configure.xml
+%{_libdir}/%{name}-%{VER}/modules-Q16/*/*.so
+%{_libdir}/%{name}-%{VER}/modules-Q16/*/*.la
 %{_libdir}/libMagickCore-6.Q16.so.*
 %{_libdir}/libMagickWand-6.Q16.so.*
 %{_bindir}/[a-z]*
+%{_datadir}/%{name}-6/*.xml
 %{_mandir}/man1/ImageMagick.*
 %{_mandir}/man1/[a-z]*
 
@@ -290,7 +293,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/Wand-config
 %{_bindir}/MagickCore-config
 %{_bindir}/MagickWand-config
-%{_libdir}/libMagick++-6.Q16.so
 %{_libdir}/libMagickCore-6.Q16.so
 %{_libdir}/libMagickWand-6.Q16.so
 %{_libdir}/pkgconfig/ImageMagick-6.Q16.pc
@@ -329,6 +331,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Sun Nov 10 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.8.7.5-1
+- new upstream release
+
 * Wed Aug 14 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 6.8.6.8-1
 - new upstream release