Browse Source

updated conky-vl.spec; added tolua++-vl/spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4228 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 11 years ago
parent
commit
4b379f6a2e
2 changed files with 158 additions and 5 deletions
  1. 45 5
      c/conky/conky-vl.spec
  2. 113 0
      t/tolua++/tolua++-vl.spec

+ 45 - 5
c/conky/conky-vl.spec

@@ -1,9 +1,12 @@
-# TODO: make libXNVCtrl-devel
+# TODO: - make libXNVCtrl-devel
+#       - with --enable-lua-imlib2
 
 %define with_alsa 0
 %define with_audacious 0
 %define with_imlib 1
-%define with_lua 0
+%define with_lua 1
+%define with_lua_cairo 1
+%define with_lua_imlib 1
 %define with_moc 1
 %define with_mpd 0
 %define with_nvidia 0
@@ -13,7 +16,7 @@
 %define with_wlan 0
 
 Name:           conky 
-Version:        1.7.1.1
+Version:        1.8.1
 Release:        1%{?_dist_release}
 Summary:	A lightweight system monitor for X
 Summary(ja):	X 用軽量システムモニタ
@@ -21,9 +24,10 @@ Group:          User Interface/X
 License:        GPLv3+
 URL:            http://conky.sf.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         conky-1.7.1.1-nonxft.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
+BuildRequires:  glib2-devel
+BuildRequires:  libxml2-devel
 BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXdamage-devel
@@ -37,6 +41,12 @@ BuildRequires: imlib2-devel
 %if %{with_lua}
 BuildRequires: lua-devel
 %endif
+%if %{with_lua_cairo}
+BuildRequires: cairo-devel tolua++-devel
+%endif
+%if %{with_lua_imlib}
+BuildRequires: imlib2-devel tolua++-devel
+%endif
 %if %{with_audacious}
 BuildRequires:  audacious-devel
 BuildRequires:  dbus-glib-devel
@@ -61,7 +71,6 @@ torsmo をベースにした X 用のシステムモニタです。
 
 %prep
 %setup -q
-%patch0 -p1 -b .nonxft
 
 for i in AUTHORS ChangeLog; do
     iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
@@ -73,6 +82,7 @@ done
     --disable-rpath \
     %if !%{with_alsa}
     --disable-alsa \
+    %endif
     %if %{with_audacious}
     --enable-audacious=yes \
     %endif
@@ -82,6 +92,12 @@ done
     %if !%{with_lua}
     --disable-lua \
     %endif
+    %if %{with_lua_cairo}
+    --enable-lua-cairo \
+    %endif
+    %if %{with_lua_imlib}
+    --enable-lua-imlib2 \
+    %endif
     %if !%{with_moc}
     --disable-moc \
     %endif
@@ -105,6 +121,10 @@ done
     %endif
     ;
 
+# don't use rpath
+%__sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+%__sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 %__make %{?_smp_mflags}
 
 
@@ -112,6 +132,9 @@ done
 %__rm -rf $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT
 
+%__rm -f $RPM_BUILD_ROOT%{_sysconfdir}/conky/conky_no_x11.conf
+%__rm -f $RPM_BUILD_ROOT%{_libdir}/conky/*.{la,a}
+
 %clean
 %__rm -rf $RPM_BUILD_ROOT
 
@@ -122,10 +145,27 @@ done
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %{_bindir}/%{name}
+%if %{with_lua_cairo} || %{with_lua_imlib}
+%{_libdir}/conky
+%endif
 %{_mandir}/man1/*
 
 
 %changelog
+* Sun Jun 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.8.1-1
+- new upstream release
+
+* Sat Mar 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.7.2-1
+- new upstream release
+- enable lua, lua-cairo
+- added BuildRequires: glib2-devel
+
+* Mon Feb 15 2010 Miroslav Lichvar <mlichvar@redhat.com> - 1.7.2-2
+- fix building with new audacious (#556317)
+
+* Tue Aug 25 2009 Miroslav Lichvar <mlichvar@redhat.com> - 1.7.2-1
+- Update to 1.7.2
+
 * Thu Jul 30 2009 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 1.7.1.1-1
 - new upstream release
 

+ 113 - 0
t/tolua++/tolua++-vl.spec

@@ -0,0 +1,113 @@
+%define         solib tolua++-5.1
+
+Name:           tolua++
+Version:        1.0.93
+Release:        1%{?dist}
+Summary:        A tool to integrate C/C++ code with Lua
+Group:          Development/Tools
+License:        MIT
+URL:            http://www.codenix.com/~tolua/
+Source0:        http://www.codenix.com/~tolua/%{name}-%{version}.tar.bz2
+Patch0:         tolua++-1.0.93-lua51.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+BuildRequires:  scons
+BuildRequires:  lua-devel >= 5.1
+
+%description
+tolua++ is an extended version of tolua, a tool to integrate C/C++ code with
+Lua. tolua++ includes new features oriented to C++
+
+
+%package devel
+Summary:        Development files for tolua++
+Group:          Development/Libraries
+Requires:       tolua++ = %{version}-%{release}
+Requires:       lua-devel >= 5.1
+
+%description devel
+Development files for tolua++
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .lua51
+%__sed -i 's/\r//' doc/%{name}.html
+
+
+%build
+scons %{?_smp_mflags} \
+    -Q CCFLAGS="%{optflags} -I%{_includedir}" \
+    tolua_lib=%{solib} \
+    LINKFLAGS="-Wl,-soname,lib%{solib}.so" shared=1
+##Recompile the exe without the soname. An ugly hack.
+gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind.o -Llib -l%{solib} -llua -ldl -lm
+
+
+%install
+%__rm -rf %{buildroot}
+%__mkdir_p %{buildroot}%{_bindir}
+%__mkdir_p %{buildroot}%{_libdir}
+%__mkdir_p %{buildroot}%{_includedir}
+%__install -m0755 bin/%{name}  %{buildroot}%{_bindir}
+%__install -m0755 lib/lib%{solib}.so %{buildroot}%{_libdir}
+%__install -m0644 include/%{name}.h %{buildroot}%{_includedir}
+cd %{buildroot}%{_libdir}
+ln -s lib%{solib}.so libtolua++.so
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%defattr(-,root,root,-)
+%{_libdir}/lib%{solib}.so
+%doc README doc/*
+
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/%{name}
+%{_libdir}/libtolua++.so
+%{_includedir}/%{name}.h
+
+
+%changelog
+* Sat Mar 27 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.0.93-1
+- initial build based on Fedora development package
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.92-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.92-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Mar 13 2008 Tim Niemueller <tim@niemueller.de> - 1.0.92-7
+- Added patch to make tolua++ compatible with GCC 4.3
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.92-6
+- Autorebuild for GCC 4.3
+
+* Wed Aug 22 2007 Ian Chapman <packages@amiga-hardware.com> 1.0.92-5
+- Release bump for F8 mass rebuild
+- Updated license due to new guidelines
+
+* Mon Aug 28 2006 Ian Chapman <packages@amiga-hardware.com> 1.0.92-4
+- Release bump for FC6 mass rebuild
+
+* Sat Jun 03 2006 Ian Chapman <packages@amiga-hardware.com> 1.0.92-3
+- Fixed issue with where tolua++ was tagged with an soname the same as the lib
+  meaning ld would fail to locate the library.
+
+* Fri Jun 02 2006 Ian Chapman <packages@amiga-hardware.com> 1.0.92-2
+- Changed license from Freeware Style to just Freeware
+- Changed => to more conventional >= for (build)requires
+- Moved %%{_bindir}/tolua++ to devel package
+- Now adds soname to library
+
+* Fri Jun 02 2006 Ian Chapman <packages@amiga-hardware.com> 1.0.92-1
+- Initial Release