rpms/codeblocks/F-7 .cvsignore, 1.17, 1.18 codeblocks.spec, 1.19, 1.20 sources, 1.17, 1.18 codeblocks-infopane.patch, 1.1, NONE
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Tue Dec 11 19:33:37 UTC 2007
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17765
Modified Files:
.cvsignore codeblocks.spec sources
Removed Files:
codeblocks-infopane.patch
Log Message:
* Tue Dec 11 2007 Dan Horak <dan[at]danny.cz> 1.0-0.28.20071210svn4719
- update to revision 4719
- fix multiarch problem with contrib subpackage (#340911)
- set a fixed timestamp on all installed data files
- preserve timestamps on updated files
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-7/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 30 Aug 2007 17:34:50 -0000 1.17
+++ .cvsignore 11 Dec 2007 19:33:03 -0000 1.18
@@ -1 +1 @@
-codeblocks-svn4413.tar.bz2
+codeblocks-svn4719.tar.bz2
Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-7/codeblocks.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- codeblocks.spec 30 Aug 2007 17:33:05 -0000 1.19
+++ codeblocks.spec 11 Dec 2007 19:33:03 -0000 1.20
@@ -1,16 +1,16 @@
-%define rev 4413
-%define date 20070828
+%define rev 4719
+%define date 20071210
Name: codeblocks
Version: 1.0
-Release: 0.27.%{date}svn%{rev}%{?dist}
+Release: 0.28.%{date}svn%{rev}%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPLv2+
URL: http://www.codeblocks.org/
Source: %{name}-svn%{rev}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: wxGTK-devel >= 2.6.0
+BuildRequires: wxGTK-devel >= 2.8.0
BuildRequires: zip
BuildRequires: dos2unix
BuildRequires: autoconf, automake, libtool
@@ -20,7 +20,6 @@
Patch1: codeblocks-plugins.patch
Patch2: codeblocks-desktop.patch
Patch3: codeblocks-autorev.patch
-Patch100: codeblocks-infopane.patch
Source100: codeblocks-getsvn
%description
@@ -46,10 +45,18 @@
%description devel
Development files needed to build Code::Blocks plugins.
+%package contrib-libs
+Summary: Libraries needed to run Code::Blocks contrib plugins
+Group: System Environment/Libraries
+
+%description contrib-libs
+Libraries needed to run Code::Blocks contrib plugins.
+
%package contrib
Summary: Additional Code::Blocks plugins
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
+Requires: %{name}-contrib-libs = %{version}-%{release}
%description contrib
Additional Code::Blocks plugins.
@@ -61,24 +68,21 @@
%prep
-%setup -q -n codeblocks
+%setup -q -n %{name}
%patch1
%patch2 -p1
%patch3
-%patch100
-
-%build
-find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
-chmod a+x bootstrap src/update
+# convert EOLs
+find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix --keepdate &> /dev/null
# fix the dir, where plugins are installed
-for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler projectsimporter scriptedwizard todo xpmanifest
+for p in astyle autosave classwizard codecompletion compilergcc debuggergdb defaultmimehandler openfileslist projectsimporter scriptedwizard todo xpmanifest
do
sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/$p/Makefile.am
done
-for p in byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems
+for p in AutoVersioning byogames cb_koders codesnippets codestat dragscroll envvars help_plugin keybinder lib_finder profiler regex_testbed source_exporter symtab wxSmith wxSmithContribItems
do
sed -i 's|$(pkgdatadir)|@libdir@/@PACKAGE@|' src/plugins/contrib/$p/Makefile.am
done
@@ -89,14 +93,16 @@
# remove execute bits from source files
find src/plugins/contrib/regex_testbed -type f -exec chmod a-x {} ';'
+find src/plugins/compilergcc -type f -exec chmod a-x {} ';'
# generate revision.m4
echo "m4_define([SVN_REV], %{rev})" > revision.m4
echo "m4_define([SVN_REVISION], 1.0svn%{rev})" >> revision.m4
echo "m4_define([SVN_DATE], %{date})" >> revision.m4
-./bootstrap
+%build
+./bootstrap
%configure --with-contrib-plugins=all
@@ -110,16 +116,19 @@
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p" install
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{plugindir}/*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/codeblocks.desktop
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
- src/setup/mime/codeblocks.desktop
+ --delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/applications/codeblocks.desktop
+
+# set a fixed timestamp (source archive creation) to generated resource archives
+touch -r %{SOURCE0} $RPM_BUILD_ROOT%{pkgdatadir}/*.zip
%clean
@@ -136,9 +145,9 @@
%postun libs -p /sbin/ldconfig
-%post contrib -p /sbin/ldconfig
+%post contrib-libs -p /sbin/ldconfig
-%postun contrib -p /sbin/ldconfig
+%postun contrib-libs -p /sbin/ldconfig
%files
@@ -157,6 +166,7 @@
%{plugindir}/libcompiler.so
%{plugindir}/libdebugger.so
%{plugindir}/libdefaultmimehandler.so
+%{plugindir}/libopenfileslist.so
%{plugindir}/libprojectsimporter.so
%{plugindir}/libscriptedwizard.so
%{plugindir}/libtodo.so
@@ -184,6 +194,7 @@
%{pkgdatadir}/debugger.zip
%{pkgdatadir}/defaultmimehandler.zip
%{pkgdatadir}/manager_resources.zip
+%{pkgdatadir}/openfileslist.zip
%{pkgdatadir}/projectsimporter.zip
%{pkgdatadir}/resources.zip
%{pkgdatadir}/scriptedwizard.zip
@@ -201,11 +212,14 @@
%{_libdir}/lib%{name}.so
%{_libdir}/pkgconfig/%{name}.pc
-%files contrib
+%files contrib-libs
%defattr(-,root,root)
%{_libdir}/libwxsmithlib.so.*
%exclude %{_libdir}/libwxsmithlib.so
+%files contrib
+%defattr(-,root,root)
+%{pkgdatadir}/AutoVersioning.zip
%{pkgdatadir}/byogames.zip
%{pkgdatadir}/cb_koders.zip
%{pkgdatadir}/codesnippets.zip
@@ -224,6 +238,7 @@
%{pkgdatadir}/images/codesnippets
%{pkgdatadir}/images/wxsmith
+%{plugindir}/libAutoVersioning.so
%{plugindir}/libbyogames.so
%{plugindir}/libcb_koders.so
%{plugindir}/libcodesnippets.so
@@ -242,6 +257,12 @@
%changelog
+* Tue Dec 11 2007 Dan Horak <dan[at]danny.cz> 1.0-0.28.20071210svn4719
+- update to revision 4719
+- fix multiarch problem with contrib subpackage (#340911)
+- set a fixed timestamp on all installed data files
+- preserve timestamps on updated files
+
* Wed Aug 29 2007 Dan Horak <dan[at]danny.cz> 1.0-0.27.20070828svn4413
- update to revision 4413
- update the License tag
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/F-7/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 30 Aug 2007 17:34:50 -0000 1.17
+++ sources 11 Dec 2007 19:33:03 -0000 1.18
@@ -1 +1 @@
-a833b807c163cb0d0eaddf8fc6f957ce codeblocks-svn4413.tar.bz2
+3fb0bc53b3682a36f0783f4506ef8f1e codeblocks-svn4719.tar.bz2
--- codeblocks-infopane.patch DELETED ---
More information about the fedora-extras-commits
mailing list