Browse Source

2015-01-15 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* kdelibs, libpqxx: fixed Requires
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9262 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
dcf0bd8bc8
2 changed files with 15 additions and 4 deletions
  1. 10 2
      k/kdelibs/kdelibs-vl.spec
  2. 5 2
      lib/libp/libpqxx/libpqxx-vl.spec

+ 10 - 2
k/kdelibs/kdelibs-vl.spec

@@ -14,7 +14,7 @@ Summary: KDE Libraries
 Summary(ja): KDE ライブラリ
 Name: kdelibs
 Version: 4.14.3
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -22,7 +22,6 @@ URL: http://www.kde.org/
 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.xz
 
-
 # make kdelibs-devel parallel-installable with kdelibs3-devel
 Patch0: kdelibs-4.9.95-parallel_devel.patch
 
@@ -98,6 +97,9 @@ Patch090: return-not-break.-copy-paste-error.patch
 Patch091: coding-style-fixes.patch
 Patch092: return-application-icons-properly.patch
 
+# revert disabling of packagekit
+Patch093: turn-the-packagekit-support-feature-off-by-default.patch
+
 ## security fix
 
 # rhel patches
@@ -236,6 +238,7 @@ Requires: openssl-devel
 Requires: phonon-devel
 # considered part of nepomuk-devel
 Requires: shared-desktop-ontologies-devel >= 0.7
+Requires: soprano-devel >= %{soprano_ver}
 Requires: qt4-devel
 # do we really still need all these below? -- Rex
 Requires: strigi-devel
@@ -302,6 +305,7 @@ API ドキュメントを含んでいます.
 %patch90 -p1 -R -b .return-not-break.-copy-paste-error
 %patch91 -p1 -R -b .coding-style-fixes.patch
 %patch92 -p1 -R -b .return-application-icons-properly
+%patch093 -p1 -R -b .turn-the-packagekit-support-feature-off-by-default
 
 # security fixes
 
@@ -504,6 +508,10 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 %doc %{_docdir}/HTML/en/kdelibs4-apidocs
 
 %changelog
+* Thu Jan 15 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.14.3-2
+- added Patch93
+- added R: soprano-devel to devel subpackage
+
 * Mon Dec 29 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.14.3-1
 - new upstream release
 

+ 5 - 2
lib/libp/libpqxx/libpqxx-vl.spec

@@ -2,7 +2,7 @@ Summary: A C++ API to the PostgreSQL database management system.
 Summary(ja): PostgreSQL の C++ API
 Name: libpqxx
 Version: 4.0.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
 Group: System Environment/Libraries
 License: BSD
@@ -13,7 +13,6 @@ Patch3: libpqxx-2.6.8-multilib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libpq-devel
-#Requires: postgresql-libs
 
 %description
 What libpqxx brings you is effective use of templates to reduce the 
@@ -30,6 +29,7 @@ Summary: Libraries, includes, etc. to develop PostgreSQL applications in C++.
 Summary(ja): C++ で PostgreSQL アプリケーションを開発するためのファイル集
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: libpq-devel
 
 %description devel
 Libraries, include files, etc you can use to develop PostgreSQL applications
@@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Jan 15 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.0.1-2
+- added R: soprano-devel to devel subpackage
+
 * Mon Dec  1 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.0.1-1
 - new upstream release
 - rebuilt with libpq 9.3.4