Browse Source

2014-12-14 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* commoncpp2, google-gadgets: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9154 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
70914f8589
2 changed files with 177 additions and 25 deletions
  1. 147 0
      c/commoncpp2/commoncpp2-vl.spec
  2. 30 25
      g/google-gadgets/google-gadgets-vl.spec

+ 147 - 0
c/commoncpp2/commoncpp2-vl.spec

@@ -0,0 +1,147 @@
+Summary: GNU Common C++ class framework
+Summary(ja): GNU 共通 C++ クラスフレームワーク
+Name: commoncpp2
+Version: 1.8.1
+Release: 1%{?_dist_release}
+
+License: GPLv2+ with exceptions
+Group: System Environment/Libraries
+URL: http://www.gnu.org/software/commoncpp/
+
+Source0: https://ftp.gnu.org/gnu/commoncpp/commoncpp2-%{version}.tar.gz
+Patch1: commoncpp2-1.8.1-statfix.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
+BuildRequires: doxygen
+
+%description
+GNU Common C++ is a portable and highly optimized class framework for writing
+C++ applications that need to use threads, sockets, XML parsing,
+serialization, config files, etc. This framework offers a class foundation
+that hides platform differences from your C++ application so that you need
+not write platform specific code. GNU Common C++ has been ported to compile
+natively on most platforms which support posix threads.
+
+%package devel
+Summary: Header files and libraries for %{name} development
+Summary(ja): %{name} での開発に必要なヘッダファイルとライブラリ
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+Requires: libxml2-devel
+Requires: zlib-devel
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+
+%description devel
+The %{name}-devel package contains the header files and libraries needed
+to develop programs that use the %{name} library.
+
+%package        doc
+Summary:        Documents for the %{name} library
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
+
+%description    doc
+The %{name}-doc package provide documents for zinnia library that 
+use %{name}.
+
+
+
+%prep
+%setup -q
+#patch0 -p1
+%patch1 -p1
+
+%build
+%configure \
+	--disable-static \
+	--disable-dependency-tracking
+%{__make} #%%{?_smp_mflags} smp building disabled
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_infodir}/dir
+find %{buildroot} -name '*.la' -exec rm -f {} \;
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%post -n %{name}-devel
+/sbin/install-info %{_infodir}/commoncpp2.info %{_infodir}/dir || :
+
+%preun -n %{name}-devel
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/commoncpp2.info %{_infodir}/dir || :
+fi
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING README ChangeLog
+%{_libdir}/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/cc++
+%{_includedir}/cc++/*
+%{_bindir}/ccgnu2-config
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/libccext2.pc
+%{_libdir}/pkgconfig/libccgnu2.pc
+%{_datadir}/aclocal/ost_check2.m4
+%{_infodir}/commoncpp2.info*
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+%changelog
+* Sun Dec 14 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.8.1-1
+- updated to 1.8.1
+- added Patch1 from FC
+- split documents into subpackage
+
+* Sun Jun  3 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.8.0-2
+- rebuilt with rpm-4.8.1-3
+
+* Sat May  8 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.8.0-1
+- Initial build for Vine Linux
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Apr 06 2009 Andreas Thienemann <andreas@bawue.net> - 1.7.3-1
+- Updated to new upstream version 1.7.3
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Jul 15 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.6.1-2
+- fix license tag
+
+* Wed Feb 06 2008 Andreas Thienemann <andreas@bawue.net> - 1.6.1-1
+- Updated to new upstream version 1.6.1
+- Reverted the ld-check patch as it's no longer needed
+
+* Fri Nov 10 2006 Andreas Thienemann <andreas@bawue.net> - 1.5.0-1
+- Updated package to 1.5.0
+
+* Sun May 28 2006 Andreas Thienemann <andreas@bawue.net> - 1.4.2-1
+- Updated to 1.4.2
+
+* Sun May 28 2006 Andreas Thienemann <andreas@bawue.net> - 1.4.1-1
+- Updated to 1.4.1
+
+* Sun Feb 05 2006 Andreas Thienemann <andreas@bawue.net> - 1.3.23-1
+- Incorporated suggestions for extras
+
+* Fri Feb 03 2006 Andreas Thienemann <andreas@bawue.net> - 1.3.22-1
+- Initial spec.

+ 30 - 25
g/google-gadgets/google-gadgets-vl.spec

@@ -1,12 +1,9 @@
-#define svnrev   1449
-#define alphatag 20090430svn%{svnrev}
-
 Name:           google-gadgets
 Summary:        Google Gadgets platform for Linux
 Version:        0.11.2
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 
-Group:          User Interface/Desktops
+Group:          System Environment/Libraries
 License:        ASL 2.0
 URL:            http://code.google.com/p/google-gadgets-for-linux/
 
@@ -15,28 +12,32 @@ Distribution:	Vine Linux
 Packager:	inagaki,yasumichi
 
 Source0:        http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-%{version}.tar.bz2
-#Source0:        %{name}-%{version}-r%{svnrev}.tar.bz2
+# Vine Patches
 Patch0:		NM-0.9.patch
+Patch1:		nm-mobile-devtypes.patch
+Patch2:		glib-2.32.patch
+Patch3:		gcc-4.7.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires:  curl-devel libxml2-devel zlib-devel libtool-ltdl-devel
-# still needed even if we're not buliding gtkmoz element, for JavaScript
-#%%if %{?_dist_release} == "vl5"
-#BuildRequires:  xulrunner-devel-unstable
-#%%else
-#BuildRequires:  xulrunner-devel
-#%%endif
 BuildRequires:  WebKit-gtk-devel 
-BuildRequires:  dbus-devel gstreamer-devel gstreamer-plugins-base-devel
-BuildRequires:  cairo-devel gtk2-devel librsvg2-devel
-BuildRequires:  qt4-devel zip
-# Desktop integration
-BuildRequires:  NetworkManager-devel startup-notification-devel
-# libxml2-devel needed for desktop file generation
-BuildRequires:  libxml2-devel desktop-file-utils
+BuildRequires:  cairo-devel
+BuildRequires:  curl-devel
+BuildRequires:  dbus-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  gstreamer-devel
+BuildRequires:  gstreamer-plugins-base-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  librsvg2-devel
+BuildRequires:  libtool-ltdl-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  pkgconfig
-Requires:       %{name}-frontend = %{version}-%{release}
+BuildRequires:  qt4-devel
+BuildRequires:  zip
+BuildRequires:  zlib-devel
+# Desktop integration
+BuildRequires:  NetworkManager-devel
+BuildRequires:  startup-notification-devel
+#Requires:       %{name}-frontend = %{version}-%{release}
 Requires:       hicolor-icon-theme
 
 %description
@@ -85,6 +86,10 @@ developing applications that use %{name}.
 %prep
 %setup -q -n %{name}-for-linux-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
 # Permission fixes
 chmod -x ggadget/qt/utilities.h
 # Fix invalid desktop file MIME type
@@ -95,9 +100,6 @@ done
 
 
 %build
-#autotools/bootstrap.sh
-#ln -s %{_datadir}/automake-*/mkinstalldirs libltdl/
-
 %configure --disable-static \
            --with-browser-plugins-dir=%{_libdir}/mozilla/plugins \
            --disable-gtkmoz-browser-element --disable-smjs-script-runtime
@@ -213,6 +215,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Dec 13 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.11.2-4
+- added Patch1, 2 and 3
+
 * Sat Aug 27 2011 Yasumichi Akahoshi <yasumichi@vinelinux.org> 0.11.2-3
 - add patch for building with NetworkManager-0.9.0
 - add Vendor, Distribution and Packager tag